Commit Graph

214 Commits

Author SHA1 Message Date
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
Nemanja 7573dba496
Rip out remaining machine upgrades (#24413)
* Rip out remaining machine upgrades

* eek

(cherry picked from commit a9e89ab37221c4f5eff5a9e1d42e97c6f3e0753b)
2024-01-27 23:43:49 +01:00
Kevin Zheng 25499c5c07
Fix drink examine text (#24241)
(cherry picked from commit 3506e67e88082ca22dc7b720f52748df36de4ab4)
2024-01-26 23:05:39 +01:00
Kevin Zheng de0ef57a55
Do not log missing components in OpenableSystem (#24208)
Do not log missing components

(cherry picked from commit 1e9eab0a0b7524e2fcdc3b342cc15fe777b7a7bd)
2024-01-26 23:04:23 +01:00
GreyMario 9e4fb570bc
Pie tins returned from all pies in all situations, add lathe recipes for pie tin and some other basic kitchenwares (#23217)
* move pietin trash to FoodPieBase so all pies return their pie tin when eaten

* spawn trash from a SliceableFood if the Food has a trash

* add a limited selection of additional tablewares to the autolathe

* kitchenware material adjustments

* fix crash when slice pie in hand/inventory

* use system helpers + slices now go in parent container

(cherry picked from commit 1c3c596bae1bc463ce05f3ae6f5cbe09ac59ed4c)
2024-01-26 22:33:39 +01:00
themias a626bb6754
fix mice eating (#23801)
* fix mice eating

* actually just ignore utensils

(cherry picked from commit 3fb0bd9d4b13fe828889b5ce9aea960c89dd5f4d)
2024-01-26 22:19:31 +01:00
DrSmugleaf bf936c7a88
Fix TrashOnSolutionEmptySystem modifying uninitialized entities (#23798)
(cherry picked from commit 2fe861e87d9faaf802ba91aded7082ca94c03c86)
2024-01-26 22:19:27 +01:00
GreyMario 22ea3e1656
Checking for used utensils actually happens now (#23766)
checking for utensils actually happens now

(cherry picked from commit f2647ac8d421642420b53ea5574f654390039d7b)
2024-01-26 22:16:35 +01:00
Kara 03b3e36d43
Examine prediction (#23565)
* Initial prediction

* new group handling

* groups for all examines that use multiple rn

* compile

* why was it doing this??

* handle newlines with sorting properly

(cherry picked from commit 0ae3858b69b695697ea9300609460f8ddb70ebbf)
2024-01-26 21:48:02 +01:00
TemporalOroboros ce27944275
Revert 'Revert 'Solution Entities'' (#23168)
(cherry picked from commit d23c8d5c19e56a582b6b12f832bd318efbdac7c7)
2024-01-23 23:00:42 +01:00
Leon Friedrich 3b8a4316fa
Make some prototypes use frozen collections (#22576)
* Make some prototypes use frozen collections

* poke tests

* Remove frozen dictionary enumeration

(cherry picked from commit 8587c3778abdf94041a491b1ff6330fbe6746c03)
2024-01-22 18:36:50 +01:00
Debug 18f0af1f68
Implement gridinv, proper (#703)
* Implement gridinv, 1500 squashed commits :elp:

* Me when

* Linter errors

* Fix katana belts
2024-01-21 19:58:28 +01:00
deltanedas 1d5c59ff0d
deep frier slice fix (#581)
* move SliceFoodEvent into a deltav file, move raising into Slice()

* import deltav event

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-22 12:29:41 +01:00
themias 2851e53c28 Add more DNA interactions (#21989)
* Add more DNA interactions

* remove unused import

* update based on feedback

* Add event for chemistrysystem.injector

* move event to shared; transfer dna to implanter

* doafter and interaction event fixes

* add BreakOnHandChange

* doh

* use events instead of updating component directly

* Add DataFields to ForensicScannerComponent fields

* Convert most events to system api call
2023-12-16 20:30:32 +01:00
DrSmugleaf 87e0952d81 Fix masks not toggling voice mask component (#22506) 2023-12-16 20:24:33 +01:00
DrSmugleaf b04882d1ad Move MaskComponent to shared and add toggle events (#22395)
* Move MaskComponent to shared and add toggle events

* Datafield and network IsToggled

* Add missing dirty
2023-12-16 20:15:24 +01:00
deltanedas 3b4b4ee186 small food slicing cleanup (#22291)
* component cleanup

* slice system cleanup

* thank you entprotoid

* webedit 1

* webedit 2

* bruh this shitcode has sliceable food with no slice

* ok no persistence

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-16 19:39:24 +01:00
metalgearsloth b1ee2d48ff Unrevert audio (#21330)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-12-02 20:16:36 +01:00
deltanedas 9183b2b5b7 moths can eat goat wool (#21704)
* add Wooly system

* add RequireDead to Food

* minor fix+cleanup and fix repeating

* minor fix+cleanup and fix repeating

* make goat wooly

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-19 22:22:01 +01:00
Psychpsyo 3fc496001a Soapy Water & Edible Soap (#20364)
* soap reagent and soapy water

* make soapy water recognizable

* Fix tile cleaning bug

CleanDecalsReaction was able to take more than the reactVolume it was given.

* make soapy water an evaporating reagent

* Tile reactions when mopping

* Fix indescribably soap flavor

* Adjust soap flavours

Soap and soapy water now taste clean and syndie soap tastes like punishment.

* Better soap numbers & DeleteOnSolutionEmpty

* Changed TrashOnEmpty to TrashOnSolutionEmpty

* Last TrashOnSolutionEmpty change

* Fix merged code not compiling

* Requested changes.
2023-11-12 20:26:09 +01:00
Leon Friedrich 1465c02a77 Move ActorComponent to shared (#21293) 2023-10-31 19:12:44 +01:00
Nemanja 41b8a8960d fix feeding unremovable items (#21234) 2023-10-31 18:45:36 +01:00
DrSmugleaf 9cc8a7fc81 Remove 700 usages of Component.Owner (#21100) 2023-10-20 15:31:13 +02:00
JJ f06fc04768
Deep Fryer And Its Powers (#163)
* Deep Fryer And Its Powers

The Deep Fryer has been implemented. It uses Corn Oil, Ghee, and Olive Oil to fry. Other features include:
1. Mixing Oil and Water at a certain temperature causes smoke.
2. When throwing an object at the Deep Fryer, a Chef will *always* land the shot, but anyone else has a chance of missing.
3. When an item is sliced, an event is triggered that other items can see.

* Update meal_recipes.yml

* Reworking the effects so they won't trigger on init.

* Create DeepFryerTest.cs

* Commenting out the UnsafeOilVolumeEffects part of the .yml. Something about the sound script inside of it breaks UnintializedSaveTest and it's not necessary for a smoke reaction to occur anyway.

* Update DeepFryerSystem.cs
2023-10-18 23:57:10 +02:00
TemporalOroboros 8c55d3e5ce Moves SolutionContainerManagerComponent to Shared. (#20944) 2023-10-14 22:07:17 +02:00
Kara c812f6eab0 Kill `ContainerHelpers` (#20908) 2023-10-14 22:02:35 +02:00
DrSmugleaf 4877e2aaf8 Replace string data fields with LocId where relevant (#20883) 2023-10-14 22:02:30 +02:00
deltanedas 2e3dada5e1 fix moth z on clothes eating (#20456) 2023-09-27 21:59:12 +02:00
PrPleGoo 76ef9906af Task/food hud (#19312)
* security HUD now shows a job icon on entities with a body

* thirst goggles

* set starting hud gear

* fix build

* remove from starting gear

* remove

* replace

* fix thirst and hunger icons

* update icons

* space

* space

* ]

* ]

* fix build

* fix comments

* fix

* spacing

* field

* move more namespaces

* use AutoGenerateComponentState

* comments

* fix build

* not all fields

* comments

* unpaused

* fix Dirty warning

---------

Co-authored-by: Slava0135 <super.novalskiy_0135@inbox.ru>
2023-09-27 21:59:12 +02:00
deltanedas 06a7aa82a2 Openable refactor (#19750) 2023-09-27 21:59:12 +02:00
metalgearsloth f38f0ab614 Predict StorageComponent (#19682) 2023-09-27 21:59:12 +02:00
metalgearsloth c9648da984 Content update for NetEntities (#18935) 2023-09-27 21:59:12 +02:00
Leon Friedrich e4ca6f4fb9
Allow solutions to store extra reagent data (#19323) 2023-09-05 07:55:10 +10:00
DrSmugleaf 3f3ba6ac62
Move minds, roles, jobs and objectives to shared (#19679) 2023-08-30 21:46:11 -07:00
Visne c7b21b631b
Remove unused dependencies (#19490) 2023-08-24 09:55:15 -08:00
DrSmugleaf 35107f7c2b
Fix component generic usages where IComponent would not be valid (#19482) 2023-08-24 20:10:55 +10:00
LankLTE 6b2fef1ac8
small moth changes (#18810)
* changes

* fix test fail hopefully

* disallow eating containers

* no more eating stored stuff
2023-08-08 22:05:05 -06:00
metalgearsloth 649295dcd2
Call goat protective services (#18812)
* Limit reproductivecomponent in confined areas

* Slight bump
2023-08-07 04:48:47 -05:00
Leon Friedrich 28a5e32f5e
Add prototype serialization tests. (#18458)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-08-06 12:47:45 +10:00
deltanedas e05bac1c15
Various cow fixes (#18602)
Reparent cow outputs to the correct grid.

Adjust produce so that cows and other multi-stomached animals can eat most produce.

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-04 00:15:05 -07:00
LankLTE 70545f4873
Moths. (#18593) 2023-08-04 15:21:28 +10:00
Slava0135 e6159d8581
Damage other on hit player feedback (#18539) 2023-08-02 19:30:04 +10:00
deltanedas 063f75ca29
let animals drink things (#18236)
* thirst .Owner removal

* thirst file scope

* drink update + minor refactor

* drink file scope

* let animals drink things

* dont eat/drink when dont need to

* admeme mouse override

* moo

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-07-25 15:32:10 -06:00
Visne ee4809a222
Revert "Hunger and thirst HUDs" (#18125) 2023-07-18 17:28:28 +02:00
PrPleGoo 67e4b626c1
Hunger and thirst HUDs (#18066)
* security HUD now shows a job icon on entities with a body

* thirst goggles

* set starting hud gear
2023-07-18 00:01:22 -06:00
Nemanja 716fcaa4a3
Animal Husbandry (#17140)
* Animal Husbandry

* suffixes and VV

* sanitize

* fix fails
2023-07-09 16:36:37 -06:00
deltanedas f5d2b0e284
only show flavor above 0.1u (#17169)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-07 14:29:23 +10:00
deltanedas 2bef7bfa38
magic bread wand (#17044)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-03 12:08:52 -07:00
brainfood1183 c99585c94f
Toy Box filled with toys (ready for merge) (#16252) 2023-06-03 13:31:47 +10:00