From: potato1234_x <79580518+potato1234x@users.noreply.github.com> Date: Thu, 23 Mar 2023 15:10:18 +0000 (+1000) Subject: Hydroponics Sprite Changes (#14649) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a7bafa58f1cd547c20e5486552068205c57e6478;p=space-station-14.git Hydroponics Sprite Changes (#14649) --- diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 503c1636c9..0b5d2ad25f 100644 --- 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 15397ee445..73d8c907df 100644 --- 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 207e7184a0..124ceeadf8 100644 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 521eaa71c4..27226fba0b 100644 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 e6998e82c8..edc78a2b8a 100644 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 8810652894..4695cdf2f8 100644 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 c166df646b..5c891e460e 100644 --- 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 751ca00978..fc4a93d812 100644 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 19ac83a8b4..2a5ea97c42 100644 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 7e6bc5653a..3d2a1941c5 100644 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 88e3ebd509..d1462f72ec 100644 --- 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 2c0ad715ce..5986428095 100644 --- 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 29a0fa6978..30502fa717 100644 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 cd07184a20..ed980900db 100644 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 5e66856de2..4243734bdf 100644 Binary files a/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor.png and b/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor.png differ