Commit Graph

9396 Commits

Author SHA1 Message Date
No Elka 9e12719c61
Cosmic cult entropy balance tweaks (#4099)
* Decrease entropy value

* Adjust siphoning

* Change entropyDegen

* Un-nerf cosmic equipment debuff

* Unindent by 2 spaces ops
2025-08-15 09:24:29 +03:00
No Elka bac514fc94
Multispectral inhibitor, new cosmic cult structure (#4181)
* JammerSystem additions

* Temporary sprite

* Prototypes

* Locale and guidebook changes

* Revert "JammerSystem additions"

This reverts commit b4019131b2.

* All my homies hate RadioJammerComponent

* Lower the range a tad

* Add actual sprite

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix stuff

* Kill SpriteFade while I'm at it

* Increase range

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-14 23:51:17 +00:00
Quanteey b8ae7f67c6
Speedmerge #39243 from upstream (#4190)
* Reduce system.dungeon logspam

* Update Content.Server/Procedural/DungeonJob/DungeonJob.Ore.cs

Co-authored-by: āda <ss.adasts@gmail.com>

* Fix leftover bracket

* Update Content.Server/Procedural/DungeonJob/DungeonJob.Ore.cs

Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>

---------

Co-authored-by: Atakku <atakkudev@gmail.com>
Co-authored-by: Atakku <atakkudev+github.atakku@gmail.com>
Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>
2025-08-14 23:01:18 +00:00
Quanteey 1a2b429dac Action refactor things 2025-08-14 15:59:35 +02:00
Quanteey 980bc05edc Merge remote-tracking branch 'origin/master' into upstream-merge-ops 2025-08-14 15:53:14 +02:00
No Elka 737558289b
Make cult less obvious on earlier stages (#4179)
* Random rift spawn

* Change announcements

* Tweak timers

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Do in fact use ProtoId

* Revert "Do in fact use ProtoId"

This reverts commit cdc0972cac.

* Actually add the event into the pool

* Remove ancient code

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-14 09:57:13 +00:00
No Elka a7df10b20d
Censer tweaks part 2 (#4171)
* Kill asphyx damage

* UI goidacode

* Locale

* I think this is needed too???

* Code stuff

* Code stuff

* Replace fuel with mindbreaker toxin

* Move censer to lockers

* Halve censer fuel capacity

* I sure hope the branch won't fucking explode

* Remove accidental line break

* blyat

* Update desc

* Move to nested fill
2025-08-13 11:34:50 +00:00
No Elka 8e45b2fa75
Allow cultists to absorb another rift after expending their empowerment (#4166)
* Kill

* Remove action on use
2025-08-13 11:28:27 +00:00
Quanteey c64d0563dc
Merge branch 'master' into upstream-merge-ops
Signed-off-by: Quanteey <61941975+Quanteey@users.noreply.github.com>
2025-08-10 18:59:17 +02:00
No Elka 90974a99b2
Remove do-after on null fragmentation (#4102)
* Change stuff

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix

* How did that even get here

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-09 14:30:19 +01:00
Quanteey b57229dbfa Fix NoCargoOrderArbitrage and a possible future crash 2025-08-08 12:12:16 +02:00
Quanteey 942b83fe03
Merge branch 'master' into upstream-merge-ops 2025-08-07 20:00:49 +02:00
Quanteey 6e03871555 Migrate _DV GhostRoleSystem.Character.cs to use new outfitsystem 2025-08-07 19:39:40 +02:00
Kyle Tyo 9ebebb041b Command resolves and LEC conversions batch 4 (#38382)
* reeeecolllaaaaaaaa

* gonna convert these to public while I'm here for consistency sake

* requested changes.
2025-08-07 19:30:32 +02:00
Kyle Tyo d5dccb809c Relocate SetOutfit method to ServerClothingSystem and LEC setoutfit command. (#38391)
* that'll do

* requested changes.

* missed this.
2025-08-07 19:30:19 +02:00
beck-thompson fac62f9d81 Fix stacks only recycling one instead of the stack amount (#38433)
* fix

* Fixes
2025-08-07 19:19:14 +02:00
Kyle Tyo 5273a6811e Command resolves (#38415)
touchups
2025-08-07 19:17:10 +02:00
Tayrtahn b6b1915cea Convert `AtmosphereSystem` sound path strings to `SoundSpecifier`s (#38403)
* Convert AtmosphereSystem sound path strings to SoundSpecifiers

* Convert to SoundCollections
2025-08-07 19:16:50 +02:00
Kyle Tyo fc18b3bc75 Command resolve mega pr batch 5 (#38389)
* commit progress

* requested changes
2025-08-07 19:16:44 +02:00
Kyle Tyo 5b2180ec34 Command resolve killing and LEC conversions batch 2 (#38367)
commit progress
2025-08-07 19:16:31 +02:00
Kyle Tyo 1039360c64 Command resolve mega pr 6 (#38398)
commit progress
2025-08-07 19:16:26 +02:00
Whatstone 9c9ce5e385 Add directionality to cable terminal port nodes (#38394) 2025-08-07 19:15:49 +02:00
Simon 4bad0c3cd6 Switch Discord integration to use NetCord instead of Discord.Net (#38400) 2025-08-07 19:15:43 +02:00
Perry Fraser a75ea1ab80 fix: erase expedition disks when their map is deleted (#38322)
* fix: erase expedition disks when their map is deleted

* fix: include paused entities in disk query, add dirty
2025-08-07 19:14:36 +02:00
Kyle Tyo d76afe3d72 Command resolve and LEC conversion batch 3 (#38378)
* I'm just a silly goober

* requested changes

* Update Content.Server/Interaction/TilePryCommand.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-07 19:12:57 +02:00
Whatstone c80e8bd5e7 Fix adjacent north/south cable terminals breaking east/west HV cable (#38377) 2025-08-07 19:12:18 +02:00
kosticia 282c573c13 predicted hyposprays (#38046)
* G O I D A

* how

* now proper

* a

* Update HypospraySystem.cs

* good catch

* Apply suggestions from code review

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-07 19:03:52 +02:00
beck-thompson fa450fdff1 Objectives that do not fit requirements are now deleted (#38365)
* Fix

* Update Content.Server/Objectives/ObjectivesSystem.cs

Thanks Tayrathn!

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2025-08-07 19:03:02 +02:00
Tayrtahn 1181854f82 Cleanup duplicate dependency in `AddActionCommand` (#38360)
Cleanup duplicate dependency in AddActionCommand
2025-08-07 18:49:09 +02:00
ScarKy0 b86884cf10 Commands for adding and removing actions (#38317) 2025-08-07 18:48:28 +02:00
Helix-ctrl 12cdedc99b Add hints towards flash protection to all items which provide it (#37267)
* Update welding.yml

* Update FlashSystem.cs

Add subscriber event for flash immunity examine text

* Create flash-immunity-component.ftl

* Removed changed description text

* change to use entity version

* fixed mistake
2025-08-07 18:45:39 +02:00
ScarKy0 7fed6632fb Retractable items system + Arm Blade action (#38150) 2025-08-07 18:41:36 +02:00
nikitosych fd6597d3da Fix for holoparasite's ability to attack the host through mech (#36659) 2025-08-07 18:38:36 +02:00
SyaoranFox 1496ff6e87 Zombies won't attack Initial Infected (#38128)
* Added Zombie faction roles everywhere that makes sense for initial infected to be associated with Zombies.

* Adding faction component to round start zombie. (not hopeful)

* Removed stupid attempts and added zombie faction component to the zombie system when the player is given the ability to force themself to zombify.

* Changed use of "zombie" for ProtoId<NpcFactionPrototype>

* Update Content.Server/Zombies/ZombieSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Server/Zombies/ZombieSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Removed faction component from ZombieOutbreak event. Shouldn't cause problems with the event as II gets component with their ability to self zombify.

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-07 18:27:45 +02:00
slarticodefast 1cad639d60 Fix puncturase cauterizing bleeding (#38289)
fix puncturase cauterizing bleeding
2025-08-07 18:22:47 +02:00
themias b46e9f0046 Fix gas analyzer and anom scanner wrong state (#38285)
* Fix gas analyzer and anomaly scanner UI activation issue

* save

* fix comment

* milkalyzer
2025-08-07 18:09:58 +02:00
Perry Fraser 2185ba5e21 fix: Correct respath for lizard smite icon (#38288) 2025-08-07 18:09:54 +02:00
Perry Fraser a7bca8c91a Fix some popup issues with pipe layer changes (#38244)
* fix: only show pipe layer popups to the user changing them

* fix: don't show pipe layer subfloor popup when not using a screwdriver

* fix: properly pass down user and used for serverside pipe layer changes

Technically this doesn't matter as the Shared codepath for this method
doesn't actually use these on the server: only the user is used for a
clientside popup. Still, will be good to have these for future changes
that might need them.
2025-08-07 18:09:43 +02:00
RedBookcase 993c0d4c45 Removed Toys.rsi, reorganize toy RSIs, broad /Fun/ cleanup. (#37189)
Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-08-07 17:44:39 +02:00
Quanteey 384054a27d Fix for previous 2025-08-07 16:15:07 +02:00
Simon e2739943dd Add the instrument names to the MIDI channel selector (#38083)
* Add the instrument to the MIDI channel selector

* Reviews

Adds support for chained masters
Makes the channel UI update on its own when the midi changes (Works with bands too!)

* add to admin logs and limit track count

* Limit track names by length too

* remove left over comment

* Requested changes

* Reviews
2025-08-07 12:04:09 +02:00
Cepelinas1 18d58fac84
Engraveable rings (#4103)
* rings first commit

* changes implemented

* moved engraving.ftl to other folder

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-07 02:29:29 +01:00
Quanteey 40d7ea758f Revert "Add the instrument names to the MIDI channel selector (#38083)"
This reverts commit e16c03ed29.
2025-08-07 02:55:23 +02:00
Simon e16c03ed29 Add the instrument names to the MIDI channel selector (#38083)
* Add the instrument to the MIDI channel selector

* Reviews

Adds support for chained masters
Makes the channel UI update on its own when the midi changes (Works with bands too!)

* add to admin logs and limit track count

* Limit track names by length too

* remove left over comment

* Requested changes

* Reviews
2025-08-07 02:19:03 +02:00
Tayrtahn 781ec9b715 Forbid string literals for `SharedToolSystem` methods (#38250)
* Forbid string literals for ToolSystem methods

* Cleanup violations

* Sort usings
2025-08-07 02:15:21 +02:00
Tayrtahn c3c5a49860 Cleanup unused fields in `DrinkSystem` (#38181)
Cleanup unused fields in DrinkSystem
2025-08-07 01:59:26 +02:00
pathetic meowmeow a1f3ca6a69 Allow cargo request computers to send orders to the primary account (#37943) 2025-08-07 01:57:30 +02:00
Quanteey 100fe319a9 import unfuck redux 2025-08-07 01:51:49 +02:00
DrSmugleaf e85eacb1d4 Fix eating and drinking verbs showing up after a short delay and making your verb UI bounce (#38164)
* Fix eating and drinking verbs showing up after a short delay and making your verb UI bounce

* Usings fix

* Usings fix

* Usings fix

* Usings fix

* CVar fix

* Predicted ppups

* Openable predicted popup

* Fix audio prediction
2025-08-07 01:48:46 +02:00
Orsoniks c35279089c Improved Health examination text (#38126)
* more health examinations

* better blood

* fix

* tweaks

* sizeable

* silicon fix

* tweaks

* bleeding color tweaks

* fix
2025-08-07 01:36:36 +02:00