Commit Graph

95 Commits

Author SHA1 Message Date
slarticodefast 05ad21faf0 Fix egg cooking and make microwave code a little less bad (#35459) 2025-03-01 14:52:26 +00:00
deltanedas 52611d29c9
small shitmed update (#2649)
* fix most sharp things not being usable in surgeries (#1381)

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

* somewhat untroll harpy body parts

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-01-08 06:11:31 +00:00
deltanedas 83a8002922
Merge pull request #2542 from deltanedas/shitmed-ops
shitmed real
2025-01-07 17:15:23 +00:00
deltanedas 84c0b3e895
snipe qol prs from upstream (#2614)
* Remove discard functionality from the ChemMaster

This duplicates other methods of discarding chemicals, including
the drain conventionally given to chemistry labs.

Any problems it solves are miniscule compared to the severe UI error
that is having a destructive action without confirmation attached
to a mode, the most common source of user error.

* Improve animal cube interactions (#31668)

* Working on dehydrate recipes to renew animal cubes

* Added remaining cube dehydration recipes

* Add OnExamine to RehydratableSystem.cs, need to add functionality to check total volume vs current volume to determine if 'soaked' text needs to be displayed

* Added logic to append text to the description when the wrong reagent has been added to a compressed animal cube

* Re-adding deleted summary

* Update default SolutionName to be correct

* Remove cube recipes to prevent infinite nutrient generation

* Add OnMicrowaved event to RehydratableSystem.cs in order to clear solution of cube when microwaved. CURRENT ERROR REQUIRES REFACTOR OF MICROWAVECOMPONENT

* Subscribe to microwave event

* Refactor of MicrowaveComponent.cs to be in shared folder, accessible to RehydratableSystem.cs. Updated imports

* Modify cube to only dehydrate in microwave when cooked for at least 5 seconds

* now using event to check access to fingerprint

* Tweak - Reflective vest and Energy Katana should reflect only in correct slots (#31902)

* ReflectComponentLogicFix
Added bool InRightPlace and updated relevant system

* Using SlotFlags

* prevent friendly fire for dragon/carp (#32231)

* add NoFriendlyFire

* make zombies use NoFriendlyFire

* no friendly fire for dragon

* let dragon kill naughty fish and validhunting syndies

* add button to print logprobe logs (#32255)

* add EntityName at the bottom of LogProbe

* add button to print logprobe logs

* Add camera mod to diagnostic hud (#32254)

* ai-glass

* weh to protect against bad grammar

* transmutation into diagnostic hud

* Apply forensics when loading with an ammo box

* inaprovaline metabolizes slower

* :trollface:

---------

Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
Co-authored-by: Preston Smith <Blackfoot03@outlook.com>
Co-authored-by: YourUsername <you@example.com>
Co-authored-by: BIGZi0348 <svalker0348@gmail.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: ArZarLordOfMango <arzarchannel@gmail.com>
Co-authored-by: themias <themias5@gmail.com>
Co-authored-by: Alzore <blackern5000@gmail.com>
2025-01-05 03:55:34 +00:00
deltanedas dc703f6adb make any sharp item a ghetto surgery tool (#990)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-12-27 17:08:25 +00:00
slarticodefast dcc885d65c fix microwave construction (#30232)
* fix microwave construction

* retry
2024-08-09 17:53:32 +01:00
Verm e2428b2189
Donk co. microwave + microwave tweaks (#28951)
* THE syndie microwave

* Always burn to explode microwave when copying

* Make it so copying ids stop when the microwave is goign to explode

* Made explosion destroy the board and spit out the machine parts

* Move logic is MicrowaveSystem, make metal cooking use the same logic

* Fix passing the wrong malfunction time

* Shuttle cannot escape aggressive branding

* Always make it explode with an id

* Forgot to invert bool, move it after fry chance
2024-07-05 20:34:35 +02:00
Crotalus 230c1cf328
Add auto modes to reagent grinder (#26290)
* Add auto-mode to reagent grinder

* Remove redundant stuff with DataField

* Use margin instead of dummy control

* Resolve grinder component

(cherry picked from commit a606909d30477453bc23765df4c78f04b2ead522)
2024-04-07 14:11:40 +02:00
Pieter-Jan Briers e7a3b82a8d
Use new ComponentPauseGenerator (#25183)
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.

(cherry picked from commit e00f74505c62310bd15aeaba8d6530f648397074)
2024-03-07 00:57:05 +01:00
James Simonson 1083aeb8e1
Microwave UX enhancements (#24547)
* Facelift Microwave UI

Includes new background light in UI, Uses predictive input, UI now properly disables buttons when microwave is active

* Microwave now shows Elapsed time

* Fixed bad formatting

* Added new term for "BottomMargin"

* Change yellow color

* Update StyleNano.cs

just spacing fixed

* Cook time countdown now detached from server

Instead of the server constantly sending out messages for the cook countdown, it is now predicted client side using TimeSpan

* Update MicrowaveMenu.xaml

forgot to re-add item space

(cherry picked from commit 25f73f64065f370d8560ff4695579c259e4b7667)
2024-02-18 23:03:05 +01:00
TinManTim 6bb29572eb
Adds explosion when attempting to microwave metal / bugfix (#23887)
(cherry picked from commit f499dfb63a73b2ee408c92d2e98c80ca03e4d71a)
2024-01-27 23:51:32 +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
degradka e449d0787d
Add a check for item size in the microwave system (#24026)
* Add a check for item size in the microwave system

* DataField suggestion

* Merge TryComp with HasComp

* Add datafield changeability for admins

(cherry picked from commit 562d7b4b82a49001179c1252064c8610174f8716)
2024-01-26 22:36:24 +01:00
deathride58 16faa3cf64
Fixes construction graphs proccing while being microwaved (#23835)
* Fixes construction graphs proccing while being microwaved

* git those indents in line

* We knew we were missing something!

(cherry picked from commit f5c40c362306f0c2437f39b6968ae637112aaf4e)
2024-01-26 22:33:40 +01:00
deathride58 eab437e2fc
Microwaves no longer instantly gib living creatures Microwaves now heat in real-time
* Animal cruelty nerf - microwaves no longer instantly gib, and now heat in realtime

* While we're at it there's honestly no need for this shit to be hardcoded

(cherry picked from commit 21ec29bfa6d2bd6c08aad13faf7ed9fbc958cae0)
2024-01-26 22:03:49 +01:00
SpeltIncorrectyl ea405555a1
Can no longer place an infinite quantity of items inside a microwave (#23577)
* initial commit

* rewrote code to early return to reduce nesting

* added VV to Capacity field of MicrowaveComponent

(cherry picked from commit 655b54145af67966ffffac2bfaaa97fdc407c0be)
2024-01-26 21:46:59 +01:00
Nemanja b38189c1e2
Add reagent sources to the guidebook (#22627)
* source in my guidebook

* finish it!

* sir yes sir oorah

* network that bitch, baby

(cherry picked from commit f538a2e34a4b62ac406a5871a3c52e51f8f0fad4)
2024-01-22 21:09:13 +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 55ca65dbd8 microwave can be turned on with signal (#21138)
* microwave can be turned on with signal

* update prototype

* mapinit

* init for storage

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-12 20:35:52 +01:00
DrSmugleaf a88e747a0b
Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
deltanedas 12b1f601ed
microwave tweaks (#17107)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-07 12:44:42 -07:00
Nemanja 823c8204c9
Simplifying Machine Upgrading (#15802) 2023-04-29 13:23:49 +10:00
DrSmugleaf b89159cf78
Remove kitchen spike component references (#15221) 2023-04-09 09:53:29 +10:00
metalgearsloth c8f89eca60
ECS dragdrop (#12973)
* ECS dragdrop

No more excuses.

* AAAAAAAAAAAAAA

* kry

* events

* aaaaaaaaaa

* HUH

* Fix stripping

* aaaaaa

* spoike

* asease

* fix table vaulting

* ded

* rebiew

* aaaaaaaaaaaaa

* drag

* aeaeae

* weh
2023-02-13 13:29:34 +00:00
Chief-Engineer 95e35b94b5
Improve explosion logs (#13351)
* add types to explosion logs

* make explosions logged by default

* add cause parameter to IThresholdBehavior

* add cause to ExplodeBehaviors

* add cause to power cell explosions

* remove useless log

* add triggerer to triggers

* add logs for damage from explosions

* sneaky power cell update
2023-02-10 23:45:38 +00:00
DrSmugleaf 7fbc2608e8
Remove redundant read-only VV from datafields (#12626) 2022-11-16 20:22:11 +01:00
Nemanja bd77f5cced
reagent grinder machine upgrade (#12422)
* reagent grinder machine upgrade

* grinder storage upgrades
2022-11-08 14:15:49 -06:00
Nemanja 4a20a3e839
adds machine upgrades for microwave (#12010) 2022-10-30 18:14:20 +11:00
0x6273 dfdad0ffe5
Refactor ReagentGrinder (#11751)
* Refactor ReagentGrinder

- It can now process partial stacks. (Before it would do nothing if the entire stack's solution didn't fit in the output container)
- Get rid of `SharedReagentGrinderComponent`, move shared stuff to `SharedReagentGrinder.cs`.
- Subscribe to events instead of massive switch/case.
- Get rid of update queue thing.
- Change `DoWork` so it's less duplicate code for grinding/juicing.
- Get rid of `ExtractableScalingEvent` and just scale directly based on item stack count.
- Add message for when you try to put something into the reagent grinder that doesn't fit.
- Fix obsolescence warnings.

* Use a timer on component instead of SpawnTimer

* s/StorageCap/StorageMaxEntities
2022-10-25 23:34:56 -07:00
Nemanja 32abdf5f00
Microwave ECS (#10766)
* microwave ECS

* allcomponentdelete etset

ack

* container purge
2022-08-27 16:40:29 -07:00
Nemanja 6d88c6ba88
Mining Fix (#10347) 2022-08-06 13:16:17 +10:00
Leon Friedrich c7ad6b709e
Audio System Rejig (#9635) 2022-07-29 12:13:12 +10:00
themias b76c251829
Add batch cooking (#9359) 2022-07-14 19:25:16 -07:00
keronshb f7b1bda3e5
Reorders Sound Systems signatures to match Popup Systems. (#8728) 2022-06-13 09:45:47 +10:00
Pieter-Jan Briers a323ba8223
Revert "Revert "Fix some friend access violations by allowing others access. (#8594) (#8703)" (working this time) (#8704) 2022-06-07 15:26:28 +02:00
Pieter-Jan Briers cecf87997b
Revert "Fix some friend access violations by allowing others access. (#8594) (#8703) 2022-06-07 13:44:31 +02:00
Vera Aguilera Puerto c5f7c61041
Fix some friend access violations by allowing others access. (#8594)
Rename Friend attribute to Access attribute.
Updates submodule to v0.21.0.0 as well.
2022-06-07 11:30:27 +02:00
themias 764a2a5046
Microwave was stuck in busy state on some BeingMicrowavedEvents (#8381) 2022-05-23 12:39:52 -07:00
Kara 2273b58fbe
Entities gib when being microwaved (#8144) 2022-05-14 14:04:45 +10:00
wrexbe bc68ac96dd
Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
wrexbe 16ad873688
Move disarmed event (#8130) 2022-05-13 15:30:30 +10:00
wrexbe 089e40a061
Convert suicide to ecs (#8091)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-12 22:05:16 +10:00
Alex Evgrashin 50ae467c76
Remove IDestroyAct, IBreakAct (#7876) 2022-05-02 15:43:25 -07:00
Leon Friedrich 6997bd83b2
Save seed data in components and remove the seed-database (#7499) 2022-04-16 15:32:35 +10:00
Rane 70a26bf0c2
Elimate most IInteractUsing (#7481) 2022-04-15 14:20:20 -07:00
mirrorcult 2d610ebb52
Move spawning collections of `EntitySpawnEntry` out of `StorageSystem`, make `Butcherable` use it (#7305)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-03-28 09:58:13 -07:00
Leon Friedrich 80699543d9
Make grinder use item slots (& misc eject-button changes) (#7197) 2022-03-27 21:03:03 -07:00
Leon Friedrich bfd95c493b
hands ECS (#7081) 2022-03-17 18:13:31 +11:00
Rane 926e36d81d
Convert almost all IActivate instances that open UIs to ActivatableUI (#7028)
* Chem master

* Drone support for handhelds

* Vending machines, scanners

* Cloners, R&D computers

* make research a little less sussy

* Unfuck wires

* PA control computer

* Unfuck merge

* Clean up git gore for good

* Disposals

* Microwaves

* paper

* Magic mirror

* More vendors for drones

* Solar computer whitelist

* EFR review updates
2022-03-12 11:26:06 -07:00
mirrorcult 676ca21b5f
Add knife butchering and blood gibbing (#6770) 2022-02-18 15:57:42 -07:00