Hydroponics Sprite Changes (#14649)

diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index 503c1636c9fac1755897c043a1cebdaad31a6e3a..0b5d2ad25fd3e8bb73fbbece21191598b9456642 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -93,11 +93,11 @@
 - type: entity
   parent: ClothingBackpack
   id: ClothingBackpackHydroponics
-  name: botany backpack
+  name: hydroponics backpack
   description: It's a backpack made of all-natural fibers.
   components:
   - type: Sprite
-    sprite: Clothing/Back/Backpacks/botany.rsi
+    sprite: Clothing/Back/Backpacks/hydroponics.rsi
 
 - type: entity
   parent: ClothingBackpack

diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
index 15397ee445d63f4c1c15e4bf0de45915c613a3f8..73d8c907df1562c9d3d98fbcff24d92c5ddb63c9 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -118,7 +118,7 @@
 - type: entity
   parent: ClothingBackpackDuffel
   id: ClothingBackpackDuffelHydroponics
-  name: hydroponic's duffel bag
+  name: hydroponics duffel bag
   description: A large duffel bag for holding extra gardening tools.
   components:
     - type: Sprite

diff --git a/Resources/Textures/Clothing/Back/Backpacks/botany.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/equipped-BACKPACK.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Backpacks/botany.rsi/equipped-BACKPACK.png
rename to Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/equipped-BACKPACK.png

diff --git a/Resources/Textures/Clothing/Back/Backpacks/botany.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Backpacks/botany.rsi/icon.png
rename to Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/icon.png

diff --git a/Resources/Textures/Clothing/Back/Backpacks/botany.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Backpacks/botany.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/inhand-left.png

diff --git a/Resources/Textures/Clothing/Back/Backpacks/botany.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Backpacks/botany.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/inhand-right.png

diff --git a/Resources/Textures/Clothing/Back/Backpacks/botany.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/Back/Backpacks/botany.rsi/meta.json
rename to Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/meta.json

diff --git a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/equipped-BACKPACK.png
index 207e7184a0208d4efb865b8878fc147329fabc79..124ceeadf8f45051063ddbd3eee35963a1a66373 100644 (file)
Binary files a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/equipped-BACKPACK.png differ

diff --git a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/icon.png
index 521eaa71c43c8dedc2458c1e2df789872bd4d068..27226fba0be065d25a8bd6b5639f3f06cfe4f217 100644 (file)
Binary files a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/inhand-left.png
index e6998e82c88f8fb14dee7f4cb1fe2cd32056a02b..edc78a2b8a32b0a6f79d769f31eee3834ad1db17 100644 (file)
Binary files a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/inhand-right.png
index 8810652894aa36402ef543cf0b3eb89d01d94212..4695cdf2f89a24c9974f9b2944f494d25aee9091 100644 (file)
Binary files a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/meta.json
index c166df646beea6fca0f90f7ade1105f5030af732..5c891e460ead2a6f72046e035d2eca4bda01fc17 100644 (file)
--- a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1. Modified by potato1234x (github) for SS14",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png
index 751ca009782644aec51ebcba706f4d1647ae0576..fc4a93d812d53ef40070d5900e3d51dfd4773593 100644 (file)
Binary files a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png differ

diff --git a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png
index 19ac83a8b44249470739418504753ef1b7ef684e..2a5ea97c42be5b240abe7a3c53d540bdc252d7f6 100644 (file)
Binary files a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/equipped-HAND.png
index 7e6bc5653a6981488e06d37103c573aaccffb340..3d2a1941c543cf997a4450652c35fef243952046 100644 (file)
Binary files a/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/equipped-HAND.png and b/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/equipped-HAND.png differ

diff --git a/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json
index 88e3ebd509d64a8b12d6635517ecdf0bdea931e8..d1462f72ecd8448bc466c8d56944ff8af2282584 100644 (file)
--- a/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json
+++ b/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by potato1234x (github) for SS14",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Structures/Machines/seed_extractor.rsi/meta.json b/Resources/Textures/Structures/Machines/seed_extractor.rsi/meta.json
index 2c0ad715ce885f5a36fd694a8b479a2dc670db8b..59864280952e1f5f82b41f20f4b759473c59c7c4 100644 (file)
--- a/Resources/Textures/Structures/Machines/seed_extractor.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/seed_extractor.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Modified by potato1234x (github) for SS14",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor-off.png b/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor-off.png
index 29a0fa69787b88c3f5fded7e81368c610b0540b8..30502fa717ec23b8c84e7322839e1519e02d29ce 100644 (file)
Binary files a/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor-off.png and b/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor-off.png differ

diff --git a/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor-unlit.png b/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor-unlit.png
index cd07184a20e8c8c2a7ae2dadc5040af900a44a10..ed980900db27ac7a41704e57562c7b4dd3e3c988 100644 (file)
Binary files a/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor-unlit.png and b/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor-unlit.png differ

diff --git a/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor.png b/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor.png
index 5e66856de22c8e311da5394f84ab81ce08209e19..4243734bdf45396770459440f0d4ba3d9f046c2d 100644 (file)
Binary files a/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor.png and b/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor.png differ