Commit Graph

7248 Commits

Author SHA1 Message Date
Debug bde57bb886
Merge pull request #792 from DebugOk/Wizmerge-08/02
Merge wizden up to 08/02
2024-02-08 16:47:37 +01:00
Adrian16199 a4718b2490
Fixes felinids not having nom. (#773) 2024-02-08 16:40:28 +01:00
Debug ef307b77e4
Fix invalid entry
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-02-08 13:37:51 +01:00
Debug a4fd13ae70
Fix current test fails 2024-02-08 13:05:23 +01:00
deltanedas c73f3837bd
predict egg cracking + refactor (#25028)
* move stuff to server and some refactoring

* update spikables to not use triggering

* add Delete bool just incase

* a new egg

* mom can we have webedit. no, we have webedit at home

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 55dbe26019ed22e11f017393c028c6760699343d)
2024-02-08 12:41:42 +01:00
Krunklehorn 30e03ca4ae
Fixed GluedComponent interactions with metamorphic glasses (#24943)
* Only rename if name matches reconstructed

* Rearranged query

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

* Okay

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 6e91190478ec03e038ff1c3a10ecd632808f281e)
2024-02-08 12:41:41 +01:00
Kot 2d684f3c1a
Fix scram implant's teleportation out of containers (#24827)
* Fix scram teleportation out of containers

* re-run ci

* Use AttachToGridOrMap method

(cherry picked from commit d4434dbb5e586544a5dbd067a3fee4a6bd4e9e89)
2024-02-08 12:41:40 +01:00
Kevin Zheng 7cc7dbab0a
Make radiation collector a power supplier (#24978)
(cherry picked from commit effcc5d8277cd28f9739359e50fc268ada8f4ea6)
2024-02-08 12:39:59 +01:00
Rainfey ecf9634e0c
Make Health Analysers UI continuously update (#22449)
(cherry picked from commit 4129c77a5b7c4d5cdfa4763881bdaa443c128f33)
2024-02-08 12:39:55 +01:00
Kot 74fc6715fb
Allow opening doors mid-deny animation, if you have the access (#24969)
Allow opening doors mid-deny animation, if you have access ofc

(cherry picked from commit bedccf8e31c53faff90f46822efce6143e6dc2e1)
2024-02-08 12:39:03 +01:00
Varen 1ce46c0460
Rebalances electrocution damage to a log scale (#24829)
(cherry picked from commit 1a4b96c2fcafc59a3fbf1dfe62a45d5940a6c7ac)
2024-02-08 12:37:49 +01:00
deltanedas b45675731d
move criminal records console component to shared (#24957)
* move criminal records console component to shared

* todone

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 9b1c88b78b4d27d7a762ebd80dc4294e9cf6332f)
2024-02-08 12:37:47 +01:00
keronshb 452347902d
Store Action Upgrade Fix (#24959)
(cherry picked from commit e79d2b5561692f34c3ee88c0d2a5707982227af2)
2024-02-08 12:37:32 +01:00
AJCM-git f3107f7eb6
Fixes bug with criminal records (#24954)
(cherry picked from commit a8c9af1227714aa33efeebb88aa3c9b38067d834)
2024-02-08 12:37:30 +01:00
deltanedas 965e1cae57
criminal records revival (#22510)
(cherry picked from commit 683591ab046eb720e6ccfd3d0f6e5574f5f7efbc)
2024-02-08 12:37:29 +01:00
Kot 26a6c4d8d3
Fix quantum dispose (#24772)
* Fix quantum disposable issue

* remove force

* Iterate over all the disposal holder children instead of contained ones

(cherry picked from commit 50e38cbd21950cc3bf31113c6a222d7ef8a3625b)
2024-02-08 12:36:24 +01:00
metalgearsloth c639a4efbb
Predicted movement opening lockers (#24937)
Relay wasn't really networked properly and this annoys me.

EntityStorage is still pretty skrunkly but this fixes the main issue I think.

(cherry picked from commit 042feae2e91f41f7d39e55340405e3c448903d61)
2024-02-08 12:36:12 +01:00
themias 85c69617a9
EMP disables suit sensors (#24869)
* EMP disables suit sensors

* update to supersede and not disable

* Revert "update to supersede and not disable"

This reverts commit 337028c31af1c0fa2b1838bcf5d6759bfd7ed97c.

* separate logic out into just emp events

(cherry picked from commit 09dd92ce61b90f0ec64de77e0d5ae35090b931c8)
2024-02-08 12:36:07 +01:00
keronshb 2675d7bd06
Adds a refund button & action upgrades for stores (#24518)
* adds refunds to stores

* Adds method to check for starting map

* comments, datafields, some requested changes

* turns event into ref event

* Adds datafields

* Switches to entity terminating event

* Changes store entity to be nullable and checks if store is terminating to remove reference.

* Tryadd instead of containskey

* Adds a refund disable method, disables refund on bought ent container changes if not an action

* Removes datafield specification

* Readds missing using statement

* Removes unused using statements

* What the heck is listing data

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 257909fd97c05bfde837a76afe5c5c612afc9f28)
2024-02-08 12:36:06 +01:00
Jezithyr 070af36c57
Emergency revert for pulling (#24923)
Revert "Pulling rework (#20906)"

This reverts commit 0d8254b2a2891f8d5623c9878bd0e567d0c7fe3c.

(cherry picked from commit c15b0691ec452e543a3cc6894a28bb409dbc65f8)
2024-02-08 12:34:47 +01:00
Nemanja 3c4421c107
chat color change (#24922)
(cherry picked from commit 2d48ec52abf6fe18f885d98ace617301e5020f89)
2024-02-08 12:32:27 +01:00
Krunklehorn c12dacd966
Travelling pointing arrows, brains can no longer point (#24864)
* Decoupled from gravity, constant animation time, manual networking, cubic interpolation

* Reduced overshoot

* Implemented PointAttemptEvent, reacts with mobstate & sleeping

* Brains can no longer point, PBs must be inside a chassis

* Removed chassis check, made callback more obvious

(cherry picked from commit d01d75073cc4179ca5e34cacccd2ca6387e2bf99)
2024-02-08 12:32:04 +01:00
Nemanja 49a1b47c09
Decouple panels and wires (#24840)
decouple panels and wires

(cherry picked from commit 5db6a3eafc08132b7415be23eb40506ca2f550a9)
2024-02-08 12:32:00 +01:00
lzk aded2ef145
Remove soapy water (#24301)
* localize shuttle timer eta etd

* remove soapy water for real

(cherry picked from commit c4e7f1ebe80b3a347d98784b8b0ec77e047b63d5)
2024-02-08 12:31:59 +01:00
metalgearsloth 7e7655b3c4
Pulling rework (#20906)
* Pulling rework

Fixing up the FOUR systems managing pulling, all the shitcode, and also making it nicer ingame.

* More pulling cleanup

* stats

* More cleanup

* First draft

* More pulling

* weh

* Fix puller

* Pulling working

* Fix merge

* Dunked

* Self-merge time

(cherry picked from commit 0d8254b2a2891f8d5623c9878bd0e567d0c7fe3c)
2024-02-08 12:31:57 +01:00
Jajsha 38bbf2bf5f
Various borg law fixes (#24870)
* Various fixes

* Fix bad ordering with scrambled law orders

(cherry picked from commit e4f6a4bea67e9ea99240c8053f6cbbdc70e62c7b)
2024-02-08 12:31:29 +01:00
Tayrtahn b659a3c61a
Fix pressing shift while held triggering escape (#24878)
* We meet again, my old friend.

* Helper property

(cherry picked from commit 31207006f50d342d2d29c366977ebf4f783a68ea)
2024-02-08 12:31:28 +01:00
Hannah Giovanna Dawson 29e65fd324
Actually fix round restart audio this time (#24754)
In which I'm a goober and don't clean up after
myself and accientally don't fix the issue I tried
to fix in my last round restart PR.

The audio is now maintained just like music during
restarts (yippee to ContentAudioSystem::OnRoundRestart)

This needs a refactor but at least the defect is fixed now.

(cherry picked from commit 2e7d23674ed315aa3cd36e5a744008900474c3fd)
2024-02-08 12:31:24 +01:00
Kevin Zheng 1376f8f0ba
Add popup message for activating trigger with hand (#24858)
(cherry picked from commit 6b1524138b02e1a573f70364e5766705c7cd5e26)
2024-02-08 12:27:10 +01:00
metalgearsloth b6a3448108
Make popups nullable (#24802)
This standardises it with audio and whatever. Me when I sprinkle nullchecks everywhere.

Was 50/50 on making new non-nullable methods but figured it would bloat too hard and you can't access strings by .Value anyway.

(cherry picked from commit 606c5a8c8b1005de62c33d5de888f67a8eae0ccc)
2024-02-08 12:26:32 +01:00
themias 22acbfd31c
Fix cryopod debug assert (#24830)
(cherry picked from commit efb623de19d1107f6319ebef451c043c0c606579)
2024-02-08 12:25:37 +01:00
deltanedas 0b0de4eb50
spray painter rework (#23287)
* refactor and add Department to PaintableAirlock, move it to server dir since its in namespace

* add departments to doors, cleanup

* add style -> departments mapping

* AirlockDepartmentsPrototype

* update shared spray stuff to have department

* name file the same as the class name

* department optional

* refactor spray painter system + send department

* fixy

* client

* no need to rewrite ActivateableUi

* pro ops

* the reckoning

* hiss

* .

* :trollface:

* add standard atmos colors to palette

* Update Content.Shared/SprayPainter/SharedSprayPainterSystem.cs

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit c49c78bafaddc3ed69714eaf41920e1565dbd292)
2024-02-08 12:25:35 +01:00
metalgearsloth 2a839fcb94
Remove obsolete transform call (#24217)
* Remove obsolete transform call

Shrimple PR also fixed bad flatpack call that would break on non-standard tilesizes.

* Update calls

* weh

(cherry picked from commit 52808694e0a479c162930a0aae20e91b68bc67a4)
2024-02-08 12:23:11 +01:00
Magnus Larsen e0a3cfacea
Fix clientside storage Whitelists (#24063)
* Fix outdated component name in assaultbelt whitelist

RangedMagazine was replaced with BallisticAmmoProvider in the Gun
refactor (#8301)

* Move FlashOnTrigger, SmokeOnTrigger, Flash components to Shared

* Move LightReplacerComponent to Shared

* Move Utensil, Mousetrap components to Shared

* Move SprayPainterComponent to Shared

The PaintableAirlock tag has also been removed, as it was unused &
unnecessary, likely a vestige of spray painter development when the
PaintableAirlock component wasn't in Content.Shared.

* Add trivial Produce and Seed components to Client

This allows the plant bag and botanical belt whitelists to correctly
match produce and seeds on the client, fixing the extraneous "Can't
insert" message that previously appeared.

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 9cd6e4dccdfaa7e273417e3c94d66b5171c7d841)
2024-02-08 12:22:58 +01:00
Aexxie 16d77d483e
Move grenade components to shared (#22691)
* Moves FlashComponent.cs, FlashOnTriggerComponent.cs, and SmokeOnTriggerComponent.cs to Shared

* Moves ExplodeOnTriggerComponent.cs, OnUseTimerTriggerComponent.cs, ActiveTimerTriggerComponent.cs, and SmokeOnTriggerComponent.cs to Shared

* Delete .run/Content Server+Client.run.xml

HOW DID THIS GET IN HERE ITS NOT AHHHH

* Update Content.Client/Explosion/SmokeOnTriggerSystem.cs

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

* Update Content.Shared/Explosion/Components/ActiveTimerTriggerComponent.cs

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

* Update Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs

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

* Update Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs

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

* Update Content.Shared/Explosion/EntitySystems/SharedTriggerSystem.cs

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

* Update Content.Shared/Explosion/EntitySystems/SharedSmokeOnTriggerSystem.cs

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

* Update ExplodeOnTriggerComponent.cs

* Revert "Delete .run/Content Server+Client.run.xml"

This reverts commit 29ee05f57de60eab5c92158d8eba5e3acba483c2.

* Fix?

* cannot figure out how to get this to go back please forgive

* Fixes a network issue

* leftovers

* Fixes

---------

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 467e983ba972a7ae749c95448febd19c7c285514)
2024-02-08 12:22:56 +01:00
Repo f016a076c2
Fix aHelp relay to detect AFK Admins (#24482)
* Add AFK detection for aHelp relay and admin specific afk time.

* Correct query to new refactor

* Change AFK timeout to 10min or else Pancake closes my PR 😭

* It wasnt a bug it was a feature, way less aHelps that way.

* aHelp Colors arn't real!

* Update Content.Shared/CCVar/CCVars.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 00841217062ba60d38320dfd2b93288548bb4201)
2024-02-08 12:22:51 +01:00
AJCM-git 8081242009
Cleanups PolymorphSystem/Components/Prototypes (#23721)
* Cleanups PolymorphSystem

* forgot this

* Nah

* Fix test

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit b8f0ed3975a4b887ca8dd75dcc07e0ac5ee11646)
2024-02-08 12:20:24 +01:00
Varen b828d35d76
Fixes Electrocutions to use available power, not consumed power (#24554)
-Electrocutions now happen using how much power there is rather than how much is being used.

(cherry picked from commit cdfff3c4bd49f77d9711d590eb649e365c3bca91)
2024-02-08 12:20:04 +01:00
Pieter-Jan Briers 3120f9da68
Buff the AME until somebody fixes engineering (#24806)
All the engineering numbers are complete unusable garbage and it's apparently completely impossible to properly set up power on some maps.

This is a band-aid fix (and apology to all engineering players) until somebody fixes this shit properly.

(cherry picked from commit 879b4d171efd9ae9907369d6dd856afafb381b06)
2024-02-08 12:20:01 +01:00
Arendian fa09ecd847
Paraplegicn't zombies (#24169)
* The zombie virus now cures paraplegia.

* no wheelchairbound anymore

(cherry picked from commit ecea561e44f51d2c2bbf17af46db84d3ee1a5cae)
2024-02-08 12:19:33 +01:00
Arendian b98e16ff53
Spacelube slide (#24801)
* Space lube now makes you slide

* review

* oh lord he slippin

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 4f3b8d740cecfb736b018fd78a2be71f5397644d)
2024-02-08 12:17:49 +01:00
Krunklehorn 922407e2e8
Client customization late-join spawner priority for arrivals/cryostorage (#24586)
* Initial commit, requires server restart to take effect

* Exposes callbacks directly instead, takes effect immediately

* Cleaned up control flow, swapped cvar for client customization

* Switched to int, dictionary of callbacks, migration

* Update Content.Shared/Preferences/SpawnPriorityPreference.cs

* krunkle stan

---------

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

(cherry picked from commit ed0f2aa2213cc47b817476206a2dd0b4e7c176b1)
2024-02-08 12:16:20 +01:00
Ed 25dbae8f9c
Lock Anomaly generator to research access (#24464)
* small patch

* fix

* remove garbage

* fix

* moved to shared events

* fix

* LocId

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 498ad2d5d714c73d9212bda9d3d89d53b2001e04)
2024-02-08 12:11:07 +01:00
Sergey Dikiy f6f08bdc55
Added Warning state for AME (#24699)
added warning state for AME

(cherry picked from commit f3ff35dcfa5afb417c24ba9f21cfc2bc414d0c4f)
2024-02-08 12:11:05 +01:00
Jajsha 0b5c8fde9b
Tweak borg laws (#24698)
* Change emagged laws to append modifiers instead of completely changing them.

* Maybe fix everything not working

* bugfix

* Fix missing secrecy law and allow basic borgs to be emagged correctly

* Localization

* Actual localization

* test

* Test

* Remove dummy debug value

* Fix bad law ordering

* Tweak the secrecy law

* Minor law tweaks

* Remove obsolete argument

* Fix YAML

(cherry picked from commit 27592ba898201d0b09c95f6b0958503407d01bb5)
2024-02-08 12:08:02 +01:00
Pieter-Jan Briers e934f78341
Fix chemical fuel generator division by zero (#24793)
This would happen when they run out of fuel.

(cherry picked from commit b029d05620292f4c9c793edfb2a52254f4f4d484)
2024-02-08 12:07:51 +01:00
metalgearsloth 4c7c904549
Remove vehicles (#24681)
* Remove wheelchairs

Vehicle code is dogwater and wheelchairs just keeps exposing edgecases. If someone wants it brought it back they can do vehicle refactor.

* Also this one

* Remove vehicles

* goodbye vehicles

* Remove this check

* sasd

* Cronch

* Add sprites back

* jani

(cherry picked from commit d2f20d8955a25a32aa5fb9b3631a41921b464cd4)
2024-02-08 12:06:49 +01:00
metalgearsloth 36e28ecfcf
Firestarter fixes (#24647)
* Firestarter fixes

- Actually networks the action.
- Namespace fixes.

* No networky for you

(cherry picked from commit a6ea8b210db079d30823e7b4d8faa32aefa17582)
2024-02-08 12:04:52 +01:00
Kara d35e2f39a7
Roundstart variation game rules (#24397)
* Raise `StationPostInitEvent` broadcast

* Basic variation pass handling

* standardize names + rule entities

* why does it work like that?

* add to defaults

* light break variation pass

* ent spawn entry

* move some stationevent utility functions to gamerule + add one for finding random tile on specified station

* forgot how statistics works

* powered light variation pass is good now

* station tile count function

* public method to ensure all solutions (for procedural use before mapinit)

* move gamerulesystem utility funcs to partial

* ensure all solutions before spilling in puddlesystem. for use when spilling before mapinit

* trash & puddle variation passes!

* oh yeah

* ehh lets live a little

* std

* utility for game rule check based on comp

* entprotoid the trash spawner oops

* generalize trash variation

* use added instead of started for secret rule

* random cleanup

* generic replacement variation system

* Wall rusting variation rule

* account for modifying while enumerating

* use localaabb

* fix test

* minor tweaks

* reinforced wall replacer + puddletweaker

(cherry picked from commit cc24ba6a317c4bee84ffa1eda8397c255ca92be9)
2024-02-08 12:03:43 +01:00
Nemanja cb05d8182a
fix storage open sounds playing when they shouldn't (#24752)
(cherry picked from commit 724312bdf5888b303309c0b2fab0feb409e4e1a9)
2024-02-08 12:01:56 +01:00