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	metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
	Sun, 31 Mar 2024 05:12:52 +0000 (16:12 +1100)
committer	GitHub <noreply@github.com>
	Sun, 31 Mar 2024 05:12:52 +0000 (16:12 +1100)
commit	c91ed9685349efd0cb7dc0e541f5349dbdb17f81
tree	dc14f7b14c79d6d12ca6d283d73ff20bab343ede	tree \| snapshot
parent	213c075e13a2b8aa5f1995dbf95ca82ef4b2ba92	commit \| diff

Revert Paint (#26593)

* Revert "Fix build (#26258)"

This reverts commit 6de5fbfafbde700d711a566f6a43f05f7a99e455.

* Revert "Spray Paint (Review Ready) (#23003)"

This reverts commit e4d5e7f1aebfc37b1bc3453fdb39578f3897b6a1.

# Conflicts:
# Resources/Prototypes/Entities/Structures/Holographic/projections.yml

41 files changed:

Content.Client/Paint/PaintVisualizerSystem.cs	[deleted file]	blob \| history
Content.Server/Paint/PaintSystem.cs	[deleted file]	blob \| history
Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs		diff \| blob \| history
Content.Shared/Paint/PaintComponent.cs	[deleted file]	blob \| history
Content.Shared/Paint/PaintDoAfterEvent.cs	[deleted file]	blob \| history
Content.Shared/Paint/PaintRemoverComponent.cs	[deleted file]	blob \| history
Content.Shared/Paint/PaintRemoverDoAfterEvent.cs	[deleted file]	blob \| history
Content.Shared/Paint/PaintRemoverSystem.cs	[deleted file]	blob \| history
Content.Shared/Paint/PaintedComponent.cs	[deleted file]	blob \| history
Content.Shared/Paint/SharedPaintSystem.cs	[deleted file]	blob \| history
Content.Shared/SprayPainter/SharedSprayPainterSystem.cs		diff \| blob \| history
Resources/Locale/en-US/paint/paint.ftl	[deleted file]	blob \| history
Resources/Prototypes/Catalog/Cargo/cargo_fun.yml		diff \| blob \| history
Resources/Prototypes/Catalog/Fills/Crates/fun.yml		diff \| blob \| history
Resources/Prototypes/Catalog/Fills/Lockers/misc.yml		diff \| blob \| history
Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml		diff \| blob \| history
Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/NPCs/carp.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Player/guardian.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Fun/spray_paint.yml	[deleted file]	blob \| history
Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Materials/materials.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/tiles.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Holographic/projections.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/hydro_tray.yml		diff \| blob \| history
Resources/Prototypes/tags.yml		diff \| blob \| history
Resources/Textures/Interface/VerbIcons/paint.svg	[deleted file]	blob \| history
Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png	[deleted file]	blob \| history
Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png.yml	[deleted file]	blob \| history
Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-left.png	[deleted file]	blob \| history
Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-right.png	[deleted file]	blob \| history
Resources/Textures/Objects/Fun/spraycans.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-left.png	[deleted file]	blob \| history
Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-right.png	[deleted file]	blob \| history
Resources/Textures/Objects/Fun/spraycans.rsi/spray_cap.png	[new file with mode: 0644]	blob

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

RSS Atom