diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml index 3bdc88af61..7d6a687395 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml @@ -47,6 +47,19 @@ - CP14FitInMortar - CP14AlchemicalHerbals - CP14BloodFlower + - type: Clothing + sprite: _CP14/Objects/Flora/Wild/red_rose.rsi + slots: + - mask + - head + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: fold-flip-verb + foldVerbText: fold-flip-verb + - type: FoldableClothing + foldedEquippedPrefix: flipped + foldedHeldPrefix: flipped + - type: entity id: CP14AgaricMushroom @@ -170,6 +183,17 @@ entries: - temperatureRange: 400, 500 transformTo: CP14GroundSage + - type: Clothing + sprite: _CP14/Objects/Flora/Wild/wild_sage.rsi + slots: + - head + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: fold-flip-verb + foldVerbText: fold-flip-verb + - type: FoldableClothing + foldedEquippedPrefix: flipped + foldedHeldPrefix: flipped - type: entity @@ -243,6 +267,17 @@ tags: - CP14FitInMortar - CP14AlchemicalHerbals + - type: Clothing + sprite: _CP14/Objects/Flora/Wild/blue_amanita.rsi + slots: + - head + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: fold-flip-verb + foldVerbText: fold-flip-verb + - type: FoldableClothing + foldedEquippedPrefix: flipped + foldedHeldPrefix: flipped - type: entity id: CP14Dayflin @@ -277,6 +312,17 @@ - CP14FitInMortar - CP14AlchemicalHerbals - CP14Dayflin + - type: Clothing + sprite: _CP14/Objects/Flora/Wild/yellow_dayflin.rsi + slots: + - head + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: fold-flip-verb + foldVerbText: fold-flip-verb + - type: FoldableClothing + foldedEquippedPrefix: flipped + foldedHeldPrefix: flipped - type: entity id: CP14AirLily diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/agaric.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Flora/Wild/agaric.rsi/inhand-left.png new file mode 100644 index 0000000000..9d46c2bc16 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/agaric.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/agaric.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Flora/Wild/agaric.rsi/inhand-right.png new file mode 100644 index 0000000000..26f51357a7 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/agaric.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/agaric.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Wild/agaric.rsi/meta.json index d74af1377e..ef6ba6cce8 100644 --- a/Resources/Textures/_CP14/Objects/Flora/Wild/agaric.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Flora/Wild/agaric.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github)", + "copyright": "Base1, base2, base3, base4 and base5 created by TheShuEd (Github), inhand-left and inhand-right created by Dinazewwr", "states": [ { "name": "base1" @@ -21,6 +21,14 @@ }, { "name": "base5" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/blue_amanita.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Objects/Flora/Wild/blue_amanita.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..7765e6f7bf Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/blue_amanita.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/blue_amanita.rsi/flipped-equipped-HELMET.png b/Resources/Textures/_CP14/Objects/Flora/Wild/blue_amanita.rsi/flipped-equipped-HELMET.png new file mode 100644 index 0000000000..8cc017d039 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/blue_amanita.rsi/flipped-equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/blue_amanita.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Flora/Wild/blue_amanita.rsi/inhand-left.png new file mode 100644 index 0000000000..aa460cba4e Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/blue_amanita.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/blue_amanita.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Flora/Wild/blue_amanita.rsi/inhand-right.png new file mode 100644 index 0000000000..29b5c47e82 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/blue_amanita.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/blue_amanita.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Wild/blue_amanita.rsi/meta.json index 42d0f78cf8..2da79bcb99 100644 --- a/Resources/Textures/_CP14/Objects/Flora/Wild/blue_amanita.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Flora/Wild/blue_amanita.rsi/meta.json @@ -5,13 +5,29 @@ "y": 32 }, "license": "CC-BY-SA-4.0", - "copyright": "Created by Max Gab", + "copyright": "Base1 and base2 created by Max Gab, equipped-HELMET, flipped-equipped-HELMET, inhand-left and inhand-right created by Dinazewwr", "states": [ { "name": "base1" }, { "name": "base2" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "flipped-equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/chromium_slime.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Flora/Wild/chromium_slime.rsi/inhand-left.png new file mode 100644 index 0000000000..87045ae111 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/chromium_slime.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/chromium_slime.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Flora/Wild/chromium_slime.rsi/inhand-right.png new file mode 100644 index 0000000000..5ece2f54a2 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/chromium_slime.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/chromium_slime.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Wild/chromium_slime.rsi/meta.json index efdf3384c6..55e7921f82 100644 --- a/Resources/Textures/_CP14/Objects/Flora/Wild/chromium_slime.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Flora/Wild/chromium_slime.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github)", + "copyright": "Base1, base2 and base3 created by TheShuEd (Github), inhand-left and inhand-right created by Dinazewwr", "states": [ { "name": "base1" @@ -15,6 +15,14 @@ }, { "name": "base3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/inhand-left.png new file mode 100644 index 0000000000..147bbcc6b6 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/inhand-right.png new file mode 100644 index 0000000000..fce61c6828 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/meta.json index 5e14108ff1..198b84d76a 100644 --- a/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Flora/Wild/lumishroom.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github), resprite by jaraten", + "copyright": "Base1, base2, base3, base4 and base5 created by TheShuEd (Github), Base1, base2, base3, base4 and base5 resprite by jaraten, inhand-left and inhand-right created by Dinazewwr", "states": [ { "name": "base1" @@ -21,6 +21,14 @@ }, { "name": "base5" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..603112e41d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/equipped-MASK.png b/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/equipped-MASK.png new file mode 100644 index 0000000000..21e82ce150 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/flipped-equipped-HELMET.png b/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/flipped-equipped-HELMET.png new file mode 100644 index 0000000000..d3bd14400c Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/flipped-equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/inhand-left.png new file mode 100644 index 0000000000..9db5ab2c84 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/inhand-right.png new file mode 100644 index 0000000000..1dfa5bfbd8 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/meta.json index 2198c9622f..f965c843be 100644 --- a/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/meta.json @@ -5,13 +5,33 @@ "y": 32 }, "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github)", + "copyright": "Base1 and base2 created by TheShuEd (Github), equipped-HELMET, flipped-equipped-HELMET, equipped-MASK, inhand-left and inhand-right created by Dinazewwr", "states": [ { "name": "base1" }, { "name": "base2" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "flipped-equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/wild_sage.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Objects/Flora/Wild/wild_sage.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..8a9d3146c7 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/wild_sage.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/wild_sage.rsi/flipped-equipped-HELMET.png b/Resources/Textures/_CP14/Objects/Flora/Wild/wild_sage.rsi/flipped-equipped-HELMET.png new file mode 100644 index 0000000000..567bc83add Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/wild_sage.rsi/flipped-equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/wild_sage.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Flora/Wild/wild_sage.rsi/inhand-left.png new file mode 100644 index 0000000000..3c4a787c23 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/wild_sage.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/wild_sage.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Flora/Wild/wild_sage.rsi/inhand-right.png new file mode 100644 index 0000000000..be2bcf3fe3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/wild_sage.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/wild_sage.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Wild/wild_sage.rsi/meta.json index c700258874..8de653b81c 100644 --- a/Resources/Textures/_CP14/Objects/Flora/Wild/wild_sage.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Flora/Wild/wild_sage.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd", + "copyright": "Base1, base2, base3 and base4 created by TheShuEd (Github), equipped-HELMET, flipped-equipped-HELMET, inhand-left and inhand-right created by Dinazewwr", "states": [ { "name": "base1" @@ -18,6 +18,22 @@ }, { "name": "base4" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "flipped-equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..cd63db53fb Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/flipped-equipped-HELMET.png b/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/flipped-equipped-HELMET.png new file mode 100644 index 0000000000..740efc5867 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/flipped-equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/inhand-left.png new file mode 100644 index 0000000000..95bd04698a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/inhand-right.png new file mode 100644 index 0000000000..92d99287b3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/meta.json index 97cf899eb0..2da79bcb99 100644 --- a/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/meta.json @@ -5,13 +5,29 @@ "y": 32 }, "license": "CC-BY-SA-4.0", - "copyright": "Created by Max Gab (Github)", + "copyright": "Base1 and base2 created by Max Gab, equipped-HELMET, flipped-equipped-HELMET, inhand-left and inhand-right created by Dinazewwr", "states": [ { "name": "base1" }, { "name": "base2" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "flipped-equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] }