]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Merge Injector & Hypospray Systems & Components (#41833)
authorSir Warock <67167466+SirWarock@users.noreply.github.com>
Sat, 20 Dec 2025 23:58:26 +0000 (00:58 +0100)
committerGitHub <noreply@github.com>
Sat, 20 Dec 2025 23:58:26 +0000 (23:58 +0000)
commit6932f2819136e570e8e763f53c05d1920071d9fa
treefdb9822822ce4d79506ccd7dda1316163e41a3e5
parent517b37698d3983a82a5aaf26edcd7dc432974e8f
Merge Injector & Hypospray Systems & Components (#41833)

* Merge Injector & Hyposprays

* Fixes

* Requested Changes

* Preview

* Inclusion of Prototypes

* Fix

* small oversight

* Further fixes

* A few more fixes & Bluespacesyringe buff

Co-Authored-By: āda <177162775+iaada@users.noreply.github.com>
* Final Commit, hopefully

* Merge conflict no more

* YML fix

* Add required changes

Co-Authored-By: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
* cleanup warnings removal

* Bug fix & Maintainer Requests

Co-Authored-By: āda <177162775+iaada@users.noreply.github.com>
* Adhere to requested changes

Co-Authored-By: āda <177162775+iaada@users.noreply.github.com>
---------

Co-authored-by: āda <177162775+iaada@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
24 files changed:
Content.Client/Chemistry/EntitySystems/HyposprayStatusControlSystem.cs [deleted file]
Content.Client/Chemistry/EntitySystems/InjectorStatusControlSystem.cs [new file with mode: 0644]
Content.Client/Chemistry/EntitySystems/InjectorSystem.cs [deleted file]
Content.Client/Chemistry/UI/HyposprayStatusControl.cs [deleted file]
Content.Client/Chemistry/UI/InjectorStatusControl.cs
Content.Server/Chemistry/EntitySystems/InjectorSystem.cs [deleted file]
Content.Shared/Chemistry/Components/HyposprayComponent.cs [deleted file]
Content.Shared/Chemistry/Components/InjectorComponent.cs
Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs [deleted file]
Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs [new file with mode: 0644]
Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs [deleted file]
Content.Shared/Chemistry/Events/HyposprayEvents.cs [deleted file]
Content.Shared/Chemistry/Events/InjectorEvents.cs [new file with mode: 0644]
Content.Shared/Chemistry/Prototypes/InjectorModePrototype.cs [new file with mode: 0644]
Content.Shared/Clumsy/ClumsySystem.cs
Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
Content.Shared/Inventory/InventorySystem.Relay.cs
Resources/Locale/en-US/chemistry/components/hypospray-component.ftl [deleted file]
Resources/Locale/en-US/chemistry/components/injector-component.ftl
Resources/Prototypes/Chemistry/injector_modes.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Clothing/Belt/job.yml
Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
Resources/Prototypes/tags.yml