Commit Graph

172 Commits

Author SHA1 Message Date
0x6273 ebcdca5dfa
Use old reagent dispenser beaker slot ID (#24209)
Change the slot ID back to what it was to keep old map saves with an item in the slot loading correctly.

This also fixes the "You can't put this in the dispenser!" message not appearing when inserting an item without FitsInDispenserComponent because the whitelisted slot name wasn't changed.

(cherry picked from commit 7a7d0017b504dec4b1d390b941af9791d9677287)
2024-01-26 23:04:27 +01:00
Kevin Zheng 9cc361921b
Add limited-reagent dispensers (#23907)
* Add limited-reagent dispensers

* Add empty versions for all dispensers

* Fix lint

* Set initial window size so all buttons are visible

* Simplify logic, add parenthesis

* Use localized name for initial labels

* Adjust button style

* Avoid touching items before MapInit

* Remove pre-labeling

* Reduce diff

* Clean up YAML

* Fix test

* Really fix test

* Document

* Adjust based on review

* Add labels for obnoxiously long bottles

---------

Co-authored-by: AWF <you@example.com>
(cherry picked from commit 9394a262458df76d9c4156f147bed902e3feac75)
2024-01-26 23:03:30 +01:00
nikthechampiongr 8b414701ca
Fix tranquiliser shells not working (#23886)
* Fix tranquiliser darts not working

Fixes a bug introduced by 9f47079d02a872f0aaff84f4556b83d3c6f835ef which
was made to stop the fly-by fixture from triggering the system. This was
done by checking whether the fixture was hard. Apparently the
projectile's fixture is never hard as well. The change just makes it so
that check only succeeds when the fixture is a fly-by fixture.

* Remove something that I think is redundant

* Remove random using directive that somehow appeared.

* Address Review

* Adress Review 2

* Put the appropriate fixture ids

(cherry picked from commit ef132c8a7b83691ab550e1cfe5d31fd8be2b3788)
2024-01-26 22:26:12 +01:00
metalgearsloth fee42b0287
Fix remote solution injection (#23429)
Checks if its own fixture is hard so the fly-by fixture can't also proc it.

(cherry picked from commit 9f47079d02a872f0aaff84f4556b83d3c6f835ef)
2024-01-26 21:27:48 +01:00
TemporalOroboros ce27944275
Revert 'Revert 'Solution Entities'' (#23168)
(cherry picked from commit d23c8d5c19e56a582b6b12f832bd318efbdac7c7)
2024-01-23 23:00:42 +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
Nemanja 23cbc4245e A return to foam (foam rework) (#20831) 2023-10-31 18:54:02 +01:00
TemporalOroboros 8c55d3e5ce Moves SolutionContainerManagerComponent to Shared. (#20944) 2023-10-14 22:07:17 +02:00
deltanedas 63864a0fc8 Rename SmokeDissipateSpawnComponent to SpawnOnDespawnComponent (#20782) 2023-10-14 22:02:34 +02:00
DrSmugleaf 4877e2aaf8 Replace string data fields with LocId where relevant (#20883) 2023-10-14 22:02:30 +02:00
Leon Friedrich 2d71eec6f9
Remove AllComponentsOneEntityDeleteTest (#19965)
* Remove AllComponentsOneEntityDeleteTest

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2023-09-09 19:35:05 -05:00
Vasilis 2446c6a37b
Hypo can inject solutions back into beakers (#19877)
* Inject to beakers

* Stop fighting in my pr

* Review
2023-09-07 09:49:02 -07:00
DrSmugleaf a88e747a0b
Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
deltanedas 00bae110e1
move hot plate item placement stuff into its own system (#18923)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-19 17:37:19 -07:00
forthbridge 5fc7f21853
Add Spaceshrooms (#17092)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-08-02 00:10:48 +10:00
metalgearsloth fbf1d476f2
Component ECS (#17991) 2023-07-13 20:20:46 +10:00
Arendian ec58d2e716
Syndicate sponge for uplink (#17841)
* Syndicate sponge for uplink

* Fix yaml error

* Made changes mentioned in review

* Made changes according to reviews
2023-07-09 13:24:30 -06:00
Chief-Engineer 1960dd2620
Revert "Add chem solution atmos heating and cooling (#17854)" (#17871)
This reverts commit 03d6b0ced7.
2023-07-06 23:53:19 -05:00
0x6273 03d6b0ced7
Add chem solution atmos heating and cooling (#17854) 2023-07-06 18:18:56 -07:00
themias 53e9bc8236
Fix metamorphic glass name mispredict (#16550) 2023-06-30 18:57:28 -04:00
0x6273 fcb6516cee
Hotplate overhaul (#17586)
* Hotplate overhaul

- Beakers are now placed on top of the hotplate instead of itemslot.
- Hotplate LED now only lights up if it's heating something.
- More comments/xmldoc.
- Some other minor tweaks.

* Actually remove the beaker slot
2023-06-24 14:09:24 -04:00
Nemanja 98481fb9a2
Spray Nozzle & Backpack Water Tank (#16133) 2023-05-06 11:50:09 +10:00
MisterMecky 57cb533e9c
Add strange pills, RandomFillSolutionComponent (#15067) 2023-05-02 00:43:31 +10:00
Nemanja 823c8204c9
Simplifying Machine Upgrading (#15802) 2023-04-29 13:23:49 +10:00
EnDecc 0f90548600
Advanced Mop is now More Advanced + SolutionPurge Component (#15532)
Co-authored-by: Arimah <arimah42@gmail.com>
2023-04-23 20:17:21 +10:00
deltanedas 24f7b6ffc5
experimental welder fuel regeneration (#15475)
* solution regeneration system

* experimental welding tool regenerates 1u of fuel every second

* pro

* use a solution

* added -> generated

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-04-18 10:27:05 -04:00
deltanedas 27bdc5d4b5
prevent nettles from injecting through hardsuit (#14895)
* prevent nettles from injecting through hardsuit

* pro

* better

* pro

* pro

* noob

* inject popup

* caution

* )

* ;

* 💀

* 💀

* scaf + bomb suit immune to nettle

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-04-10 19:19:43 -07:00
metalgearsloth 317a4013eb
Puddles & spreader refactor (#15191) 2023-04-10 15:37:03 +10:00
deltanedas 0663211bd0
refactor rehydration (#14707) 2023-03-24 16:00:38 +11:00
keronshb 9ebb452a3c
DoAfter Refactor (#13225)
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-02-25 01:01:25 +01:00
deltanedas 98b02b3d97
make emagged marker component (fixed version of #13867) (#14096)
* The all-in-one hacking solution
The thinking man's lockpick
The iconic EMAG

* emagged medbay's stasis bed

* left med, emagged sec' apc

* went back to chem, emagged the dispenser

* emagged the fax while i was there

* had a donut while waiting for emag to charge

* i broke into the bridge then announced 'mandatory johnson inspection in medical'

* get system instead of dependency

* feedback

* net suggestion

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

* use EnsureComp and import NetworkedComponent

---------

Co-authored-by: deltanedas <user@zenith>
Co-authored-by: deltanedas <deltanedas@laptop>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-02-18 19:03:06 -06:00
0x6273 ffaa7a96fe
ECS SolutionTransfer, move to shared (#14156)
Removes the last bit of logic from the comp, moves it to shared, and
fixes a bunch of deprecation warnings in the system.
2023-02-18 19:01:05 -06:00
Moony cc0c516e02
Improves bartending with some tweaks. (#14169)
* Improves bartending with some tweaks.
- Glasses got resprited and now support fill levels.
-

* New glass type and improve shotglass visuals.

* oobsy

* fixes

* get flasked

* flask

* flask

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-02-18 19:00:31 -06:00
Leon Friedrich 466384b081
Solution rejig (#12428) 2023-01-12 14:41:40 +11:00
Nemanja 6d97764e9d
Goodbye Microwave, Hello Hot Plates! (#13061)
* hot plates

* sprite fix AND i spelled it wrong AND forgot upgrade examine

* fix license

* IGameTiming is shit like yo mamma

* active comp
2022-12-24 19:59:51 -06:00
Pieter-Jan Briers a323671984
Changes for prototype load parallelization (#13066)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-12-20 14:25:34 -08:00
Chief-Engineer eb18363bd2
Add multiple logs (#12857) 2022-12-15 19:33:27 +01:00
metalgearsloth 6c76061887
Content changes for mapgrid kill (#12567) 2022-11-22 13:12:04 +11:00
corentt 01d71a77bb
Hypospray ECS + admin logging (#12536)
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
close https://github.com/space-wizards/space-station-14/issues/12414
2022-11-19 08:07:50 -08:00
DrSmugleaf 7fbc2608e8
Remove redundant read-only VV from datafields (#12626) 2022-11-16 20:22:11 +01:00
Justin Trotter 57907bde6f
droppers behave more like syringes (#12518) 2022-11-09 18:59:54 -06:00
metalgearsloth c0abea8047
Content side for removing IMap / IMapGrid comps (#12357) 2022-11-04 10:12:25 +11:00
Rane 8f4bd8b83b
fix MeleeChemicalInjector exploits (#12305) 2022-10-31 13:04:51 +11:00
metalgearsloth 6b6d52850a
Deprecate entitylookupcomponent (#12159)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-10-27 23:37:55 +11:00
Justin Trotter f2d05aa20a
allow syringes to set transfer amount (#12173)
* allow syringes to set transfer amount

* stripped custom transfer logic, and added delay per additional 5u transfered

* touch up

* another touch
2022-10-25 23:40:06 -07:00
0x6273 0c24f8b69b
ReagentDispenser ECS (#11418) 2022-10-03 17:57:32 -07:00
metalgearsloth f51248ecaa
Melee refactor (#10897)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-09-29 15:51:59 +10:00
Illiux 71e46de0fc
Rework the ChemMaster's output handling (#11207)
* Fix doc comment on FitsInDispenserComponent

It's clearly intended to be a doc comment, but wasn't.

* Allow the ChemMaster to accept canisters and bottles

* Give the ChemMaster an output container slot

* Tweak ChemMaster UI layout

* Make more ChemMaster UI tweaks

* Update ChemMaster SpinBox max handling

* Rework the ChemMaster

* Apply suggestions from code review

Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>

* Implement PR feedback

* Switch ChemMaster to a tabbed UI layout

* Rename Amount to Dosage for clarity

* Replace Amount with Dosage in messages

* Clarify dose in UI

Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
2022-09-14 19:10:12 -05:00
metalgearsloth fed0c0c108
Fix gun clumsy (#11246) 2022-09-13 08:52:36 -05:00
0x6273 0c8e52c163
ChemMaster ECS (#11052) 2022-09-05 22:06:47 -07:00