4346 Commits

Author SHA1 Message Date
Aviu00
8922181b84 Cherrypicks 4 (#393)
* Immovable Rod changes (#26757)

* Adds non randomized rod velocity (#27123)

* adds non randomized rod velocity

* Adds despawn suffix to despawn rod

* make fire spreading scale with mass (#27202)

* make fire spreading scale with mass

* realer

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

* lower max firestacks to 10, refactor flammable (#27159)

* lower max firestacks to 10, refactor flammable

* fix

* uncap fire stack damage, lower fire stack damage

* fix fire spread round removal (#27986)

* fix a resolve debug assert

* rewrite fire spread

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

* fire troll fix (#28034)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Hide doafters if you're in a container (#29487)

* Hide doafters if you're in a container

* Out of the loop

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

* Add ghost role raffles (#26629)

* Add ghost role raffles

* GRR: Fix dialogue sizing, fix merge

* GRR: Add raffle deciders (winner picker)

* GRR: Make settings prototype based with option to override

* GRR: Use Raffles folder and namespace

* GRR: DataFieldify and TimeSpanify

* GRR: Don't actually DataFieldify HashSet<ICommonSession>s

* GRR: add GetGhostRoleCount() + docs

* update engine on branch

* Ghost role raffles: docs, fix window size, cleanup, etc

* GRR: Admin UI

* GRR: Admin UI: Display initial/max/ext of selected raffle settings proto

* GRR: Make a ton of roles raffled

* Make ERT use short raffle timer (#27830)

Co-authored-by: plykiya <plykiya@protonmail.com>

* gives loneops a proper ghost role raffle (#27841)

* shorten short raffle (#28685)

* - fix: Conflicts.

* - fix.

---------

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: HS <81934438+HolySSSS@users.noreply.github.com>
2024-06-29 23:02:26 +03:00
ThereDrD0
e9232e638c Another fixes and features (#392)
* fix: doorlights supports emagging now + fix emergency light

* add todo to PointLightAirlockSystem.cs

* tweak: reduce captain armor size

* fix: fix wt550 magazine stored rotation

* add: new lobby songs

* fix: fix lobby music rotation
2024-06-29 09:49:43 +03:00
Jabak
8de3924481 Merge remote-tracking branch 'upstream/master' 2024-06-28 11:45:35 +03:00
Aviu00
649ded64d6 Разное (#385)
* - add: Meatspike changes.

* - fix: Fix socks.

* - remove: No light status.

* - tweak: Raptor tweak.

* - fix: Fix exception.

* - remove: Remove unsexed.

* - tweak: Crossbow tweak.

* - add: More meatspike.

* - tweak: Nerf buff rune.

* - tweak: No throwing during incorporeal.

* - add: Incorporeal magic cooldown.
2024-06-26 14:56:29 +03:00
Jabak
266ab94335 Merge remote-tracking branch 'upstream/master' into ups 2024-06-26 13:09:06 +03:00
ThereDrD0
afa3325f60 срезал че не стоило срезать (#383) 2024-06-26 05:57:46 +03:00
ThereDrD0
e35098f7dd Красивое УИ телепорта для призрака (#378)
* add: nice ghost teleport ui

* fix: fix unused import

* wtf

* fuck you, search bar

* fix-add: finally
2024-06-26 05:13:42 +03:00
Aviu00
2fefca5f70 Cherrypicks 3 (#382)
* Mobs burn to ashes on excessive heat damage (#26971)

* mobs burn to ashes on excessive heat damage

* remove comment, remove random lines I didn't mean to add

* combine code into behavior

* clean unused

* fix namespace

* drop next to

* fix spawn entities behavior spawning entities outside container

* fix burning to ash not working on all mobs (#27158)

* add ghostnado button to warp menu (#27556)

* add ghostnado button to warp menu

* translator ops

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Make arguments and parameters wrap to one variable per line (#27766)

* Fix ghosts getting spawned in nullspace (#27617)

* Add tests for ghost spawn position

* Make ghosts spawn immediately

* Format mind system

* Move ghost spawning to GhostSystem

* Spawn ghost on grid or map

This fixes the ghosts being attached the parent entity instead of the grid.

* Move logging out of the ghost system

* Make round start observer spawn using GhostSystem

* Move GameTicker ghost spawning to GhostSystem

Moved the more robust character name selection code over.
Moved the TimeOfDeath code over.
Added canReturn logic.

* Add overrides and default for ghost spawn coordinates

* Add warning log to ghost spawn fail

* Clean up test

* Dont spawn ghost on map delete

* Minor changes to the role test

* Fix role test failing to spawn ghost

It was failing the map check due to using Nullspace

* Fix ghost tests when running in parallel

Not sure what happened, but it seems to be because they were running simultaneously and overwriting values.

* Clean up ghost tests

* Test that map deletion does not spawn ghosts

* Spawn ghost on the next available map

* Disallow spawning on deleted maps

* Fix map deletion ghost test

* Cleanup

---------

Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: ShadowCommander <shadowjjt@gmail.com>
2024-06-26 00:39:44 +03:00
Jabak
ce87e33237 Merge remote-tracking branch 'upstream/master' 2024-06-22 15:40:08 +03:00
ThereDrD0
77696fa638 Реврайт освещения от дверей на клиент (#375)
* fix: doors no longer light up without power

* rework: rewrite PointLightAirlockSystem on client

* public to private

* cleanup
2024-06-22 13:53:37 +03:00
Jabak
5ac7ca6faa Merge remote-tracking branch 'upstream/master' into ups 2024-06-21 21:53:12 +03:00
ThereDrD0
9c73dac5be fix: access can be granted again (#373) 2024-06-21 13:44:40 +03:00
CaypenNow
fa348657f9 Обновление модулей (#365)
* base aim module

* sprites, prototypes

* more prototypes

* fix

* fix

* fix2
2024-06-21 13:24:13 +03:00
ThereDrD0
4419931172 Мягкий свет для всякого (#316)
* add: add small soft light to laser weapon + fix the bluest blue energy shield

* git commit

* boltlights done

* add: HuetaSystem

* add: Doorlights finally done

* add: small light to lockers

* add: small light to multitool

* fix: fix naming

* hui pizde

* fix: fix parasha

* add: small light to powercells

* zabil

* add: code light to welders

* tweak: better energy and radius

* add: better color parameters

* add: less radius and energy for guns

* add: better lights for vending machines

* add: better light to consoles

* add: better light for apc

* shut up

* fix: thank you neuro colleague
2024-06-21 06:15:55 +03:00
RinKeeper
e32403a26c synthflesh nerf (#343)
* synthflesh nerf

* sky-blue carpet

* vaporSystem tweak

* throwSystem tweaks

* Revert "throwSystem tweaks"

This reverts commit a8820ab703ba3008bddeafbe7933ae94e88db3c8.

* Revert "vaporSystem tweak"

This reverts commit da5a7ef1db42033ee115467295882323f9d58ce6.

* prevent double collision rework

* showmanifest command

* client issue
2024-06-20 22:29:43 +03:00
ThereDrD0
cb37ba5714 QoL для ХоПа (#369)
* add: nice job icons ui for HoP console

* Ebanniy rot

* add: Changing id visuals with HoP console

* cleanup

* add: remove drop down list and replace it with icon-buttons

* add: colored and sorted by department buttons

* add: columns

* tweak: nicer colors

* cleanup
2024-06-20 22:29:26 +03:00
Aviu00
3bfc442f7b Cherrypicks 2 (#371)
* Handheld teleporter portals now must start on the same grid. (#28423)

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

* hand teleport portals now may start in the same grid. (#28556)

* Implement vital chef's hat functionality (#25950)

* Implement crucial chef's hat functionality

* Unified stopping code and added events.

* Added documentation to events

* Rerun tests

* Made review changes, and fixed potential desync bug.

* Update whitelist

* Make Hamlet a valid chef's hat pilot (#29191)

* Dropping Corpses Devoured by Space Dragons on Gib/Butcher. (#28709)

* Update DevourSystem.cs

* Update DevourSystem.cs

* Update Content.Server/Devour/DevourSystem.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Treatment of blood loss in the Rat King (#26887)

Bloodloss-RatKing

* - fix: Fix error.

---------

Co-authored-by: Moony <moony@hellomouse.net>
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: IlyaElDunaev <154531074+IlyaElDunaev@users.noreply.github.com>
2024-06-20 19:24:36 +03:00
Jabak
c88050b109 Merge remote-tracking branch 'upstream/master' 2024-06-17 00:04:36 +03:00
Aviu00
3353440a99 Реворк экспедиций (#360)
* - add: Expedition rework.

* - tweak: Hardsuit tweak.
2024-06-16 18:33:26 +03:00
Jabak
da298741e4 Merge remote-tracking branch 'upstream/master' 2024-06-15 19:29:46 +03:00
Aviu00
73954e87b1 Indicator fixes (#357)
* - fix: Fix hud showing stealth entities.

* - fix: Fix aghost SSD indicator.

* - tweak: Make ninja more stealthy.
2024-06-15 16:11:59 +03:00
Remuchi
a4647cf529 [Fix] Исправление Popup (#354)
* fix: теперь попапы не видно в чате через всю станцию и стены

* fix: use examine system instead of interaction
2024-06-14 18:47:15 +07:00
Jabak
56784ca0dc Merge remote-tracking branch 'upstream/master' 2024-06-13 09:07:23 +03:00
Aviu00
4d09ed9245 Spellblade update (#346)
* - tweak: Don't close eui too quickly.

* - add: Spellblade update.

* - fix: Cult teleport spell.
2024-06-11 23:07:47 +03:00
Aviu00
01511adbb2 Magic 4 (#345)
* - fix: Fix teleport scroll.

* - add: Spell book.

* - add: Smite scroll & update shuttle.

* - tweak: Tweak cost.
2024-06-10 13:57:32 +03:00
Jabak
77234ff343 Кушать хочу 2024-06-09 20:49:07 +03:00
Aviu00
0c34a1fd9b Magic 3 (#340)
* - add: Some tweaks and localization.

* - add: Teleport spell.

* - tweak: Tweak wizard hardsuit.

* - add: Turn off shield on cast.

* - add: New wizard clothes & update wizard shuttle,

* - remove: Remove old clothes from shuttle.

* - fix: No teleporting to centcomm.
2024-06-09 19:26:27 +03:00
Jabak
38ae317e71 Merge remote-tracking branch 'upstream/master' 2024-06-08 22:36:55 +03:00
Aviu00
c1fe31b63b More magic (#338)
* - tweak: Magic tweaks.

* - add: Rework some spells.

* - fix: Some bugfixes.

* - tweak: Less requirements.

* - add: Loc.
2024-06-08 16:01:49 +03:00
Aviu00
ad65bd1e58 Фиксы (#332)
* - fix: Fix desword flipping on server.

* - fix: Fix invalid cult target.

* - fix: Fix narsie summon.

* - tweak: Weaker heavy attack.

* - tweak: Less toy desword stamina damage.

* - fix: FrameUpdate.

* - tweak: Less blunt bleed.
2024-06-06 13:22:49 +03:00
Aviu00
2978834228 Esword stuff (#329)
* - fix: Fix black RGB.

* - add: Toy sword update.

* - add: FlipOnHitSystem.

* - tweak: Price reduction.
2024-06-05 17:31:21 +03:00
Jabak
bcf4074eca Merge remote-tracking branch 'upstream/master' 2024-06-04 14:07:10 +03:00
Aviu00
9d1c014938 Вернуть трейлы от пуль (#270)
* - add: Bring back bullet trails.

* - add: Cvar, thinner trails.

* - add: Add option.
2024-06-04 14:00:48 +03:00
Jabak
d2b24c049d Merge remote-tracking branch 'upstream/master' 2024-06-03 19:54:40 +03:00
Aviu00
ad72eea8a1 - add: Cleanup TelescopeSystem. (#325) 2024-06-02 20:50:04 +03:00
Aviu00
231927a577 Security update (#323)
* add: security hud update

* access & fix names

* translates

* fix

* - fix: Fixes.

* - fix: Условно-досрочно.

---------

Co-authored-by: CaYpeN1 <artem7771art@gmail.com>
2024-06-01 16:28:21 +03:00
ThereDrD0
5a705ac195 Revert "[Feat] Обновление для визора СБ (#274)" (#320)
This reverts commit 3a5fcf35a5.
2024-06-01 14:12:12 +03:00
CaypenNow
3a5fcf35a5 [Feat] Обновление для визора СБ (#274)
* add: security hud update

* access & fix names

* translates

* fix
2024-06-01 10:30:21 +03:00
Jabak
d35247adc5 Merge remote-tracking branch 'upstream/master' 2024-05-31 23:12:21 +03:00
Remuchi
d4be4d3445 [Feat] Внешний вид и название канистр можно изменить прямо в игре (#317)
* feat: Теперь можно менять внешний вид канистр газов

* fix: русский язык (я его не знаю)
2024-05-30 17:28:53 +03:00
Aviu00
2ccbaf09a4 Merge remote-tracking branch 'upstream/master' into ups 2024-05-03 14:26:57 +03:00
Valtos
5d37092a0a Fix Chat (#291)
* removes transparency

* fit options
2024-04-23 02:50:07 +05:00
Remuchi
9565de0262 [Feat&Fix] Система лежания (#288)
* лежать

* лучше так сделать

* - remove: Gravity is fine.

* - add: Hit moving lying targets.

* - tweak: Lie down insted of stun on FTL.

* - fix: Fix double component.

* - remove: Disable recoil.

---------

Co-authored-by: Aviu00 <aviu00@protonmail.com>
2024-04-22 18:14:23 +03:00
Aviu00
6272da2bb3 Fixes (#289)
* - fix: Ling fixes.

* - fix: Fix ghasp identity.

* - fix: Low temp slowdown fix.

* - fix: Crossbow fix.

* - fix: Fix gamerules.

* - fix: Fix shadow shackles.

* - fix: Cleanup refund.

* - fix: Can't pry runic door.

* - fix: Fix crash.

* - fix: Fix mood.

* - fix: Fix dictionary.
2024-04-21 18:07:27 +03:00
Remuchi
fb0b1705ec [Fix] Хотфиксы пары вещей (#286)
* fix: педали теперь снова могут играть, если у них были выбраны фелиниды

* fix: фикс спама от взаимодействия с цветками
2024-04-20 18:25:15 +07:00
Remuchi
28b714a318 fix: теперь в лобби можно прослушать голос 2024-04-20 12:38:13 +07:00
Jabkas
0d2e7dda61 - add: Clippy 2024-04-16 20:40:28 +03:00
Remuchi
e2b6002076 Merge remote-tracking branch 'origin/master' into upstream
# Conflicts:
#	Content.Server/Antag/AntagSelectionSystem.cs
#	Content.Server/Changeling/ChangelingRuleSystem.cs
#	Content.Server/Changeling/ChangelingSystem.Abilities.cs
#	Content.Server/Doors/Systems/DoorSystem.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
#	Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
#	Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
#	Content.Server/Holosign/HolosignSystem.cs
#	Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
#	Content.Server/_White/Cult/GameRule/CultRuleComponent.cs
#	Content.Server/_White/Cult/GameRule/CultRuleSystem.cs
#	Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs
#	Content.Server/_White/Keyhole/KeyholeSystem.cs
#	Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs
#	Content.Shared/Projectiles/SharedProjectileSystem.cs
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
#	Content.Shared/_White/Keyhole/Components/KeyBaseComponent.cs
#	Resources/Locale/ru-RU/White/stuff.ftl/runes-entities.ftl
#	Resources/Locale/ru-RU/_white/cult/blood-spear.ftl
#	Resources/Locale/ru-RU/_white/cult/bolt-barrage.ftl
#	Resources/Locale/ru-RU/_white/cult/cult.ftl
#	Resources/Locale/ru-RU/_white/cult/gui.ftl
#	Resources/Locale/ru-RU/cult/cult-structure.ftl
#	Resources/Locale/ru-RU/cult/pylon.ftl
#	Resources/Maps/White/Scoupidia.yml
#	Resources/Maps/White/Void.yml
#	Resources/Maps/White/WonderBox.yml
#	Resources/Prototypes/Actions/types.yml
#	Resources/Prototypes/Atmospherics/gases.yml
#	Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
#	Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
#	Resources/Prototypes/Catalog/uplink_catalog.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
#	Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
#	Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
#	Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
#	Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
#	Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
#	Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
#	Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
#	Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
#	Resources/Prototypes/Entities/Structures/Walls/grille.yml
#	Resources/Prototypes/Entities/Structures/Walls/walls.yml
#	Resources/Prototypes/Entities/Structures/stairs.yml
#	Resources/Prototypes/_White/Entities/Objects/Misc/books.yml
2024-04-13 13:59:00 +07:00
Remuchi
7ca05487a9 еще приколы 2024-04-13 12:55:14 +07:00
Remuchi
f21ef6953c всякое прикольное 2024-04-13 11:58:34 +07:00