git.smokeofanarchy.ru Git - space-station-14.git/commit

]> git.smokeofanarchy.ru Git - space-station-14.git/commit

projects / space-station-14.git / commit

author	Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
	Tue, 31 Oct 2023 20:39:12 +0000 (21:39 +0100)
committer	GitHub <noreply@github.com>
	Tue, 31 Oct 2023 20:39:12 +0000 (13:39 -0700)
commit	6a18bdc023df332c769e4624ac9d71a830d1aea8
tree	a7c90d27b5c321567399319054423af90feeb42e	tree \| snapshot
parent	672969b710d3da073564ef2b3757cb2aba411835	commit \| diff

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.

57 files changed:

Content.Server/Chemistry/Components/DeleteOnSolutionEmptyComponent.cs	[new file with mode: 0644]	blob
Content.Server/Chemistry/EntitySystems/DeleteOnSolutionEmptySystem.cs	[new file with mode: 0644]	blob
Content.Server/Chemistry/TileReactions/CleanDecalsReaction.cs		diff \| blob \| history
Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs		diff \| blob \| history
Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs		diff \| blob \| history
Content.Server/Fluids/EntitySystems/PuddleSystem.cs		diff \| blob \| history
Content.Server/Nutrition/Components/TrashOnSolutionEmptyComponent.cs	[moved from Content.Server/Nutrition/Components/TrashOnEmptyComponent.cs with 86% similarity]	diff \| blob \| history
Content.Server/Nutrition/EntitySystems/TrashOnSolutionEmptySystem.cs	[moved from Content.Server/Nutrition/EntitySystems/TrashOnEmptySystem.cs with 65% similarity]	diff \| blob \| history
Content.Shared/Chemistry/Components/Solution.cs		diff \| blob \| history
Resources/Locale/en-US/flavors/flavor-profiles.ftl		diff \| blob \| history
Resources/Locale/en-US/reagents/meta/cleaning.ftl		diff \| blob \| history
Resources/Locale/en-US/reagents/meta/physical-desc.ftl		diff \| blob \| history
Resources/Prototypes/Entities/Markers/Spawners/Random/soap.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/chemistry.yml		diff \| blob \| history
Resources/Prototypes/Flavors/flavors.yml		diff \| blob \| history
Resources/Prototypes/Reagents/cleaning.yml		diff \| blob \| history
Resources/Prototypes/Recipes/Reactions/cleaning.yml		diff \| blob \| history
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/deluxe-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/deluxe-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/deluxe-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/deluxe-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/deluxe.png	[deleted file]	blob \| history
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/gibs-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/gibs-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/gibs-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/gibs-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/gibs.png	[deleted file]	blob \| history
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/nt-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/nt-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/nt-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/nt-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/nt.png	[deleted file]	blob \| history
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/omega-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/omega-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/omega-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/omega-4.png	[moved from Resources/Textures/Objects/Specific/Janitorial/soap.rsi/omega.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/soap-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/soap-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/soap-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/soap-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/soap.png	[deleted file]	blob \| history
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/syndie-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/syndie-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/syndie-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/syndie-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Janitorial/soap.rsi/syndie.png	[deleted file]	blob \| history

Форк Space Station 14 с переводами на русский

RSS Atom