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	brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
	Sun, 31 Mar 2024 03:21:18 +0000 (04:21 +0100)
committer	GitHub <noreply@github.com>
	Sun, 31 Mar 2024 03:21:18 +0000 (14:21 +1100)
commit	5f063d2d6d2a41702b60d11f779e23c34fa74410
tree	b2b2b8af8fc1c4c2ac8cbab9dc1db8cbdbd45380	tree \| snapshot
parent	80c4d3ea0fd2cd18e4070f7cf714067db591228c	commit \| diff

Toilet Upgrade (needs review) (#22133)

* Toilet Draft

* fixes

* toilets now have secret stash to place items in cistern.

* fixes

* plungers now unblock toilets.

* fix sprite

* new sprites and fix

* fixes

* improve seat sprites.

* fix

* removed visualisersystem changed to genericvisualizers

* flush sound for toilets and copyright for toilet sprites.

* fix atrributions

* fixes

* fix datafield flushtime

* sprite improvements

* fixes

* multiple changes

* fix

* fix

* fixes remove vv

* moved stash related functions to secret stash system from toilet.

* fix

* fix

* changes for recent review.

* fix

* fix

51 files changed:

Content.Client/Disposal/Systems/DisposalUnitSystem.cs		diff \| blob \| history
Content.Client/Toilet/ToiletVisualsSystem.cs	[deleted file]	blob \| history
Content.Server/Construction/Conditions/ToiletLidClosed.cs	[deleted file]	blob \| history
Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs		diff \| blob \| history
Content.Server/Resist/EscapeInventorySystem.cs		diff \| blob \| history
Content.Server/Storage/Components/SecretStashComponent.cs	[deleted file]	blob \| history
Content.Server/Toilet/ToiletSystem.cs		diff \| blob \| history
Content.Shared/Buckle/Components/StrapComponent.cs		diff \| blob \| history
Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs		diff \| blob \| history
Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs		diff \| blob \| history
Content.Shared/Disposal/SharedDisposalUnitSystem.cs		diff \| blob \| history
Content.Shared/Plants/PottedPlantHideComponent.cs	[moved from Content.Server/Plants/Components/PottedPlantHideComponent.cs with 80% similarity]	diff \| blob \| history
Content.Shared/Plants/PottedPlantHideSystem.cs	[moved from Content.Server/Plants/Systems/PottedPlantHideSystem.cs with 86% similarity]	diff \| blob \| history
Content.Shared/Plunger/Components/PlungerComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Plunger/Components/PlungerUseComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Plunger/PlungerDoAfterEvent.cs	[new file with mode: 0644]	blob
Content.Shared/Plunger/Systems/PlungerSystem.cs	[new file with mode: 0644]	blob
Content.Shared/Storage/Components/SecretStashComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Storage/EntitySystems/SecretStashSystem.cs	[moved from Content.Server/Storage/EntitySystems/SecretStashSystem.cs with 55% similarity]	diff \| blob \| history
Content.Shared/Toilet/Components/ToiletComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Toilet/Systems/SharedToiletSystem.cs	[new file with mode: 0644]	blob
Content.Shared/Toilet/ToiletComponent.cs	[deleted file]	blob \| history
Content.Shared/Toilet/ToiletVisuals.cs	[deleted file]	blob \| history
Resources/Audio/Effects/Fluids/attributions.yml		diff \| blob \| history
Resources/Audio/Effects/Fluids/flush.ogg	[new file with mode: 0644]	blob
Resources/Audio/Effects/Fluids/splash.ogg	[new file with mode: 0644]	blob
Resources/Audio/Weapons/glug.ogg	[new file with mode: 0644]	blob
Resources/Locale/en-US/storage/components/secret-stash-component.ftl		diff \| blob \| history
Resources/Locale/en-US/toilet/toilet-component.ftl		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Furniture/toilet.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml		diff \| blob \| history
Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml		diff \| blob \| history
Resources/Prototypes/Recipes/Construction/furniture.yml		diff \| blob \| history
Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_down.png	[deleted file]	blob \| history
Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_up.png	[deleted file]	blob \| history
Resources/Textures/Structures/Furniture/toilet.rsi/condisposal.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Furniture/toilet.rsi/disposal-charging.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Furniture/toilet.rsi/disposal-closed.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Furniture/toilet.rsi/disposal-down.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Furniture/toilet.rsi/disposal-flush.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Furniture/toilet.rsi/disposal-open.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Furniture/toilet.rsi/disposal-up.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Furniture/toilet.rsi/disposal.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Furniture/toilet.rsi/dispover-charge.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Furniture/toilet.rsi/dispover-full.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Furniture/toilet.rsi/dispover-handle.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Furniture/toilet.rsi/dispover-ready.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Furniture/toilet.rsi/meta.json		diff \| blob \| history
Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_down.png	[deleted file]	blob \| history
Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_up.png	[deleted file]	blob \| history

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

RSS Atom