Commit Graph

9235 Commits

Author SHA1 Message Date
Theo 96c75908df
Nymph forces ghost return (#3976)
* Forced ghost override such that when a nymph is created, the ghost is forced into the nymph.

* Update Content.Server/Species/Systems/NymphSystem.cs

Add labeller identifying deltav change to upstream code

Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Signed-off-by: Theo <tad3@illinois.edu>

---------

Signed-off-by: Theo <tad3@illinois.edu>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
2025-06-17 16:17:25 +00:00
AftrLite b5b96335b0
Cosmic Cult | Finale emergency hotfix (#3948)
* emergency hotfix moment

* .
2025-06-14 07:03:00 +02:00
Field Command 1ec61d6df6
Midpoint: New EOR destination station (#3894)
* Midpoint

* Midpoint code

* Map polish

* Nav enabled

* Renamed traitor "escape to CC" objective

* meow

* Midpoint Extensions

* Extra beacons

* Latest Fixes

* Revert CC time being only 30 seconds

* Last fix

---------

Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
2025-06-13 13:14:58 -05:00
AftrLite 409cd39883
Cosmic Cult | Patch 1.1.0 (#3905)
* initial commit

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

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

* my whitespace so trailing

* Merge branch 'coscult-tweakandfix' of https://github.com/AftrLite/Delta-v into coscult-tweakandfix

* tweaks

* 2nd content commit

* linter oopsie

* my yml so linter

* ubuntu build test fail my beloathed

* weighting tune

* requested changes + audio changes for licensing

* using begone

* tweak

* begone spawnmenu entry

* yml fix, nyano code tweak, effigy tweak

* review commit

* testfail nonsense begone

* requested changes from a review that doesn't even exist yet

* emote change
2025-06-13 11:51:31 +02:00
SolStar ba27370eef
Fix admins reciving chelps when deadmined (#3938)
* catch null case

* ensure safe execution order
2025-06-11 20:15:15 +00:00
SolStar 429616aea3
Curator Help 2 Electric Boogaloo (#3870)
* Revert #3094

* add button

* Copy over AHelpUIController.cs

* replace ahelp with chelp

* change sound

* updated icon

* check for chelp flag

* switched the files oops

* cwoink

* remove buttons

* Seperate Cwoink System

* loc

* Purple

* fix up cwoink

* check for curatorhelp flag

* Button cleanup

* new cvars yay

* add VV

* description and resizing

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

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

* description update

* fish changes pt 1

* fish guy part 2

* fix fail

* cache so cool

* attributions

* Cwoink verb

* spelling

* file rename

* Update Content.Shared/_DV/CCVars/DCCVars.CHelp.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Commands/OpenCHelpCommand.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* toby

* Update Content.Client/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkControl.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkControl.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkControl.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkControl.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkControl.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkWindow.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* toby 2

* toby 3

* toby pog

* meow

* Apply suggestions from code review

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* meow

* meow 2

* sawmill

* 2

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* forgor

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Resources/Locale/en-US/_DV/curation/cwoink.ftl

Signed-off-by: Tobias Berger <toby@tobot.dev>

---------

Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>
Signed-off-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2025-06-10 10:56:50 +00:00
Perry Fraser 6b94d37925
fix: bring back kill traitor objectives (#3889) 2025-06-03 00:08:09 +00:00
KOTOB b7c3da08dd
Accidental Discharges (#3869)
* why does this keep crashing

* its real

* 12.5% -> 10%

* dependencyops

* commentops

* changeops
2025-06-01 06:55:56 +00:00
AftrLite e05796f834
Cosmic Cult | Refactor Chantry/Fragmentation (#3866)
* initial commit

* refactor fragmentation & chantry to not use polymorph

* linter lmao
2025-05-30 13:35:43 +00:00
AftrLite 7879398565
Cosmic Cult | r1.01 (#3851)
initial commit
2025-05-28 05:40:23 +01:00
AftrLite c4f588bc7d
Cosmic Cult | Release Patch (#3811)
* initial commit

* whoops

* guidebook

* typo oof

* fix?

* untouch stuff (WHOOPS), refactor tile detonation, remove remaining rogue ascendant stuff, requested changes

* cosmic void namefix per request

* oh heck last minute fix

* unique deathsound

* requested changes

* this should untouch it..?

* obligatory blank line fix

* requested changes + guidebook update + gameplay communication polish
2025-05-24 17:39:57 +01:00
pathetic meowmeow a465f6d0a5
Revert traitor reputation (#3823) 2025-05-22 23:59:12 +01:00
deltanedas e58c2d814c
Merge pull request #3787 from deltanedas/upstream-ops
upstream merge 18/05/2025
2025-05-21 20:14:43 +01:00
deltanedas 7e207e3cfa no seizures thank you ArtisticRoomba 2025-05-21 18:24:52 +01:00
metalgearsloth 8501c94855 Use velocity along normal for shuttle impacts (#37667)
* Use velocity along normal for shuttle impacts

Scrapes shouldn't have the same level of destruction as full-on ramming anymore. Also detecting scrapes should be a lot easier for future stuff.

* Update Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
2025-05-21 18:24:52 +01:00
Avalon b94cf51f0e
Revert "Return of warops" (#3807)
Revert "Return of warops (#3561)"

This reverts commit ac1604d0bc.
2025-05-21 01:14:47 -04:00
deltanedas 5c15e32e09
fix ransom buyback not working (#3810)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-05-21 01:29:02 +01:00
deltanedas fc95eb8f29
make assist objective failing more robust (#3796)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-05-20 14:27:23 +01:00
deltanedas 72ca3275ef
reimplement assist contract traitor picking (#3786)
* reimplement assist contract traitor picking

* goida

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-05-19 07:57:03 +01:00
deltanedas 4fc95f96d8 merge master 2025-05-19 07:56:08 +01:00
deltanedas ac43c95d24 goida 2025-05-19 07:49:53 +01:00
slarticodefast 8103db45fc Cleanup atmos air grenade code (#37568)
cleanup
2025-05-18 18:44:42 +01:00
Super c87feeb4d3 A lone operative successfully nuking the station now actually ends the round. (#36498)
LoneOpsSpawn is now of an indefinite duration -- it lasts until either the LoneOp dies or the nuke detonates. This means a few things.
2025-05-18 18:44:40 +01:00
Simon 767c438ea5 Make Nukie and Wizard Comms Console not announce who it was sent by (#37567) (modified)
* Make Nukie and Wizard Comms Console not announce who it was sent by.

* Add doc-comment to field
2025-05-18 18:44:04 +01:00
metalgearsloth 39c755a345 Add ImplicitRoofComponent (#36112)
* Add ImplicitRoofComponent

So shuttles get marked as rooved.

* Early-out

So the new render doesn't suck up perf unnecessarily.
2025-05-18 18:33:39 +01:00
deltanedas e66b0b93de let SRN bypass research grid check 2025-05-18 18:30:24 +01:00
ArtisticRoomba 84c21892b2 Atmos Air Grenades (#37531) 2025-05-18 18:24:00 +01:00
Nemanja 8fb64b730f Make research clients grid-local (#36821)
* Limit RD servers to the station grid

* the sluth
2025-05-18 18:23:15 +01:00
Nemanja 7f7847f043 Salvage Job Board (#37549)
* Salvage Job Board

* More development

* Small boy

* Computer yaml (partial)

* UI

* Rank unlock logic

* Job label printing

* appraisal tool integration

* Jobs

* add board to QM locker

* boom!

* command desc

* mild rewording

* ackh, mein pr ist brohken
2025-05-18 18:21:06 +01:00
Krunklehorn 704fc1f507 AutomaticAtmosSystem uses MassDataChangedEvent, clarifies TileMassMultiplier (#37548)
* Initial commit, no tile changes, just mass

* Rename TileMassMultiplier to TileDensityMultiplier
2025-05-18 18:12:59 +01:00
YotaXP 482e69e029 Persist construction menu favorites server-side (#35867)
* Persist construction menu favorites to player profile

* Use `ProtoId`s for construction favorites

* Validate construction favorites updates from the client

* Actually await the async database call
2025-05-18 18:12:44 +01:00
Ilya246 7b9444e80b shuttle impacts port (#37422)
* initial

* adjust densities and thruster hp

* Fix evil hack

* Last stuff

* review, cleanup

* admin RW

* minor cleanup

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2025-05-18 18:12:11 +01:00
metalgearsloth c748a415ff DungeonData rework (#37172)
* DungeonData rework

Back to fields, serializes better, just make new layers dumby.

* wawawewa

* Fix this

* Fixes

* review

* thanks fork

* fix
2025-05-18 18:11:29 +01:00
ScarKy0 aac5716782 Make SharpComponent work with Hands (#37543)
* init

* review
2025-05-18 18:11:29 +01:00
ScarKy0 976704d180 TemperatureProtection now works directly on entities (#37544)
* init

* review

* review
2025-05-18 18:11:29 +01:00
Errant 0773013643 MindRemoveRole refactor (#34880)
* MindRemoveRole refactor

* role removal logstring rework

* zombiesystem fix
2025-05-18 18:11:29 +01:00
āda 217f0088e3 HumanoidCharacterProfile and IdCardConsoleComponent constants moved to cvar. Sync id card length with character name length (#35407)
* commit

* mark TODOs

* compiles

* cleanup

* cleanup

* oops

* changed my mind

* requested changes

* genpop fix
2025-05-18 18:10:23 +01:00
Nemanja 8b74565a88 Don't group damage in the HealthChange.cs guidebook text (#37507) 2025-05-18 17:56:24 +01:00
Qerd 5978580e18 Not exclusive whitelist diet. Vox regain access to old food. (#37497)
* Creates a secondary digestible whitelist that is not exclusive. Additionally reworks the Vox stomach.

* Update FoodSystem.cs

Remnants of an old attempt. Cleaning it.

* Update vox.yml

Remnants of an old attempt. Cleaning up.

* Whitelist no longer, now the diet exclusion var is a bool.

* Clean-up

* Update Content.Server/Body/Components/StomachComponent.cs

Typo fixing

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

* Update Content.Server/Body/Components/StomachComponent.cs

Clarifications.

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

* Update Content.Server/Nutrition/EntitySystems/FoodSystem.cs

Typo fixing

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

* Update Resources/Prototypes/Body/Organs/vox.yml

Typo fixes

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

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2025-05-18 17:56:24 +01:00
Velcroboy 5bcccc6eb0 Wall inheritance cleanup (#37436)
* Cleanup walls.yml

* quick check

* Fix tilewall cmd

* More Cleanup

* Arrnrtrayiage

* Remove double parenting

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2025-05-18 17:56:23 +01:00
metalgearsloth bb190e1183 Predict pulling hands blocking (#37504)
Think I forgor to add this one when I split the 1 morbillion PRs out.
2025-05-18 17:55:59 +01:00
metalgearsloth f015a88907 Fix tile-events returns (#37502)
* Fix tile-events returns

Should really be continues.

* More

* More optimisations
2025-05-18 17:55:33 +01:00
metalgearsloth edfe4ada5b Shuttle speed bump (#37505)
* Shuttle speed bump

Will probably go to 80 when guns get bumped and we get CCD but just makes impacts more representative.

* cook
2025-05-18 17:55:33 +01:00
ScarKy0 0ef85846f2 Strip All Debug Verb (#37426)
* init

* yippee

* review

* permission check

* command

* loc

* review

* review

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-05-18 17:55:23 +01:00
metalgearsloth bd05a7abf2 Predict sleeping action (#37414)
* Predict sleeping action

* reviews
2025-05-18 17:53:30 +01:00
Tayrtahn c49f137013 Content changes for SetTiles change (#37229)
* Content changes for SetTiles change

* Retest with new engine changes

* Derp

* Update for new engine PR changes
2025-05-18 17:52:32 +01:00
qwerltaz e694825d85 air alarm panic wire snipping forces panic mode (#36439)
* air alarm panic wire snipping forces panic mode

* document

* ForcedMode is datafield

* switch to bool flag

* lock button when panic wire cut

* prevent manually individually changing scrubbers from siphon when panic wire is cut

* failure alert when wire snipped

* is Control

* remove double horizontalExpand

* Update Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs

* Update Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-05-18 17:40:25 +01:00
metalgearsloth 886b54e6d6 Predict gas valves (#33836)
* Predict gas valves

* wawawewa

* Fix imports before I get yelled at

* soff
2025-05-18 17:39:12 +01:00
Princess Cheeseballs 6603d3888f [HOTFIX] Movement Rewrite Hotfix Shuttles now respect their friction values (#37154)
* Shuttles now use their proper friction values

* Documentation

* Shuttles now use their proper friction values

* Documentation

* What the instrumentsystem doin

* what the instrumentsystem doing 2
2025-05-18 17:30:54 +01:00
metalgearsloth 2db152d363 Predict gasthermomachines (#33837)
* Predict gasthermomachines

* despawn

* smellby
2025-05-18 17:30:44 +01:00