diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index 8585bae168d..4e2a86a3aba 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml @@ -72,6 +72,8 @@ prob: 1 - id: ClothingOuterApronBotanist prob: 0.8 + - id: HydroponicsToolClippers + prob: 0.5 - id: ClothingBeltPlant prob: 1 - id: TowercapSeeds diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml index 738561200d3..0ecfc5248cb 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml @@ -16,6 +16,23 @@ - type: Item sprite: Objects/Tools/Hydroponics/hoe.rsi +- type: entity + name: plant clippers + parent: BaseItem + id: HydroponicsToolClippers + description: A tool used to take samples from plants. + components: + - type: Tag + tags: + - PlantSampleTaker + - type: Sprite + sprite: Objects/Tools/Hydroponics/clippers.rsi + state: icon + - type: ItemCooldown + - type: MeleeWeapon + - type: Item + sprite: Objects/Tools/Hydroponics/clippers.rsi + - type: entity name: scythe parent: BaseItem @@ -30,9 +47,12 @@ state: icon - type: ItemCooldown - type: MeleeWeapon - - type: Item + - type: Clothing sprite: Objects/Tools/Hydroponics/scythe.rsi - + size: 20 + Slots: + - back + - type: entity name: hatchet parent: BaseItem diff --git a/Resources/Textures/Objects/Tools/Hydroponics/clippers.rsi/icon.png b/Resources/Textures/Objects/Tools/Hydroponics/clippers.rsi/icon.png new file mode 100644 index 00000000000..ad6a47f027d Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/clippers.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/clippers.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Hydroponics/clippers.rsi/inhand-left.png new file mode 100644 index 00000000000..719ff0c22b2 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/clippers.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/clippers.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Hydroponics/clippers.rsi/inhand-right.png new file mode 100644 index 00000000000..5632d970b68 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/clippers.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/clippers.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/clippers.rsi/meta.json new file mode 100644 index 00000000000..2bd70432d02 --- /dev/null +++ b/Resources/Textures/Objects/Tools/Hydroponics/clippers.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/3160508c1a9f367be0ab054cceaf2e36c0b66250", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/icon.png b/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/icon.png index 4f61e98fb0e..701e0cbf8ae 100644 Binary files a/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/icon.png and b/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/inhand-left.png index 8b657275ee4..545d7f635dc 100644 Binary files a/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/inhand-left.png and b/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/inhand-right.png index 284d8469060..2e2ed7d7c73 100644 Binary files a/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/inhand-right.png and b/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/meta.json index ab98f8e78ad..2bd70432d02 100644 --- a/Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Hydroponics/hoe.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 Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/3160508c1a9f367be0ab054cceaf2e36c0b66250", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..23d599d0e01 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/icon.png b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/icon.png index 3686b5ee1a5..867ae6ecd5d 100644 Binary files a/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/icon.png and b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/inhand-left.png index e5cc8f3989c..f12f7429d43 100644 Binary files a/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/inhand-left.png and b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/inhand-right.png index b1ae85201b6..a0c66dd830f 100644 Binary files a/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/inhand-right.png and b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/meta.json index ab98f8e78ad..c82626cfbfc 100644 --- a/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi/meta.json @@ -1,12 +1,15 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/3160508c1a9f367be0ab054cceaf2e36c0b66250", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "icon" + }, { "name": "inhand-left", "directions": 4 @@ -16,7 +19,8 @@ "directions": 4 }, { - "name": "icon" + "name": "equipped-BACKPACK", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/equipped-BELT.png index b987b130eb2..3dc1e759a40 100644 Binary files a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/icon.png b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/icon.png index c9040945657..fa77413bc1c 100644 Binary files a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/icon.png and b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/inhand-left.png index 89e4a523173..168ad468dc6 100644 Binary files a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/inhand-left.png and b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/inhand-right.png index c63f1476866..5d563ea90a1 100644 Binary files a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/inhand-right.png and b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json index bb2b1a28668..aa99fa574a8 100644 --- a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Hydroponics/spade.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 Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/3160508c1a9f367be0ab054cceaf2e36c0b66250", "size": { "x": 32, "y": 32