From 8f55a4fcfc79dce27a8e21e5a260ebc74f5ef970 Mon Sep 17 00:00:00 2001 From: Hannah Giovanna Dawson Date: Sat, 30 Aug 2025 15:42:43 +0100 Subject: [PATCH] Scurrets - can wear pet bags, mail bags and spears (#38774) * Scurrets - can wear pet bags, mail bags and spears * a * Resolve PR comments --- .../Entities/Clothing/Back/specific.yml | 1 + .../Objects/Specific/Cargo/mail_bag.yml | 5 ++ .../Entities/Objects/Weapons/Melee/spear.yml | 5 +- .../scurret_inventory_template.yml | 12 +++++ .../Cargo/mail_bag.rsi/equipped-BACKPACK.png | Bin 0 -> 447 bytes .../Specific/Cargo/mail_bag.rsi/meta.json | 50 ++++++++++-------- 6 files changed, 48 insertions(+), 25 deletions(-) create mode 100644 Resources/Textures/Objects/Specific/Cargo/mail_bag.rsi/equipped-BACKPACK.png diff --git a/Resources/Prototypes/Entities/Clothing/Back/specific.yml b/Resources/Prototypes/Entities/Clothing/Back/specific.yml index b80e7709d5..54b8f677b8 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/specific.yml @@ -96,6 +96,7 @@ - WhitelistChameleon - CorgiWearable - PetOnly + - ScurretWearable - type: Construction graph: ClothingBagPet node: bagPet diff --git a/Resources/Prototypes/Entities/Objects/Specific/Cargo/mail_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Cargo/mail_bag.yml index 9f7ad36eb6..bf41e70be1 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/mail_bag.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Cargo/mail_bag.yml @@ -12,6 +12,7 @@ quickEquip: false slots: - belt + - back - type: Item size: Ginormous - type: Storage @@ -28,3 +29,7 @@ - Document - Paper - type: Dumpable + - type: Tag + tags: + - ScurretWearable + - CorgiWearable diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index 2dfb1b363f..01e31bc467 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -12,6 +12,7 @@ - type: Tag tags: - Spear + - ScurretWearable - type: Fixtures fixtures: fix1: @@ -217,7 +218,7 @@ - type: entity name: sharkminnow tooth spear - parent: Spear + parent: Spear id: SpearSharkMinnow description: A spear with a sharkminnow tooth as a tip. components: @@ -233,4 +234,4 @@ types: Piercing: 25 #throw dmg enough to two-shot carp - type: Construction - graph: SpearSharkMinnow \ No newline at end of file + graph: SpearSharkMinnow diff --git a/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml index 28b95eb3d3..89f0af0302 100644 --- a/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml +++ b/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml @@ -59,6 +59,18 @@ dependsOnComponents: - type: AllowSuitStorage displayName: Suit Storage + - name: back + slotTexture: back + fullTextureName: template_small + slotFlags: BACK + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 3,2 + strippingWindowPos: 0,5 + displayName: Back + whitelist: + tags: + - ScurretWearable - name: outerClothing slotTexture: suit slotFlags: OUTERCLOTHING diff --git a/Resources/Textures/Objects/Specific/Cargo/mail_bag.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Specific/Cargo/mail_bag.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..cb922af5ed9a4ffed5f2dfc5cf14393481011f9c GIT binary patch literal 447 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zD?MEtLn`LH zy=j=>gIZbm`HpBAlph3^7RNFDSIoZdA501wws3$8~>d9pFP$|sb( zbktGZd8FI(!C$xD>E-q3qU9W1AmD#tu09a0w00NVG;@B6*rq0lh3oIuEK^uq^fG4Q z`h#4L?yQ-~T#&1Ok(b@OxM{`q(3x9{HoxdvYT1})G1K{kE#tF{uEQT&zURyTkUjNp z&ufiytB(MwjBy6Kwbww#V#k`}GtYa^ zXV|!7*NUrxmZ^RY@7gZ?pTCWVLHC?5)OkSaN=m8NQmuP)Z}Xhov!PFM#i^hjhChEd zUAQjrb=!|W6_pXp%39U`UyE*jQS~|YB2TMd!vbkOv(I*G6sBn@tXA-f*6!Fi^ZP<+ zzm=t4yb7^1Pm4?l4Vb#{3d5zTm3P%2+~X;q%is}q0W7vuRZsEZMDYc$c$PYwFRagZ fVp9Twtkv?O&09r_dOzd>V}!xe)z4*}Q$iB}7>UFG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Cargo/mail_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Cargo/mail_bag.rsi/meta.json index 9e95fc65da..9aa1e7b1c7 100644 --- a/Resources/Textures/Objects/Specific/Cargo/mail_bag.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Cargo/mail_bag.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprites by Velken, based on the Chem Bag sprites from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Velken, based on the Chem Bag sprites from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi. equipped-BACKPACK modified from equipped-BELT by FairlySadPanda (GitHub).", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } -- 2.51.2