From b537e34cfc4a17ac187fc0dc8bd77e3f4444d8c8 Mon Sep 17 00:00:00 2001 From: TadJohnson00 Date: Fri, 20 Sep 2024 20:01:56 +1000 Subject: [PATCH 01/11] belt rework --- .../Locale/en-US/deltav/clothing/belts.ftl | 7 ++ .../Catalog/Fills/Items/Belts/belts.yml | 10 +-- .../DeltaV/Entities/Clothing/Belt/belts.yml | 16 +++++ Resources/Prototypes/DeltaV/tags.yml | 66 +++++++++++------- .../Entities/Clothing/Belt/belts.yml | 43 +++++++++--- .../Objects/Weapons/Throwable/grenades.yml | 3 + .../Entities/Clothing/Belt/belts.yml | 55 ++++++++++++--- .../Entities/Objects/Weapons/Melee/sword.yml | 2 +- .../Clothing/Belt/belt_overlay.rsi/baton.png | Bin 0 -> 599 bytes .../Belt/belt_overlay.rsi/flashbang.png | Bin 0 -> 565 bytes .../Belt/belt_overlay.rsi/gasgrenade.png | Bin 0 -> 644 bytes .../Clothing/Belt/belt_overlay.rsi/katana.png | Bin 0 -> 806 bytes .../Clothing/Belt/belt_overlay.rsi/medkit.png | Bin 0 -> 601 bytes .../Clothing/Belt/belt_overlay.rsi/meta.json | 35 ++++++++++ .../Clothing/Belt/belt_overlay.rsi/slp.png | Bin 0 -> 679 bytes .../Belt/belt_overlay.rsi/universal.png | Bin 0 -> 718 bytes .../Belt/belt_overlay.rsi/wakizashi.png | Bin 0 -> 646 bytes 17 files changed, 186 insertions(+), 51 deletions(-) create mode 100644 Resources/Locale/en-US/deltav/clothing/belts.ftl create mode 100644 Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/baton.png create mode 100644 Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/flashbang.png create mode 100644 Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/gasgrenade.png create mode 100644 Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/katana.png create mode 100644 Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/medkit.png create mode 100644 Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/slp.png create mode 100644 Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/universal.png create mode 100644 Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/wakizashi.png diff --git a/Resources/Locale/en-US/deltav/clothing/belts.ftl b/Resources/Locale/en-US/deltav/clothing/belts.ftl new file mode 100644 index 00000000000..22f13a790e9 --- /dev/null +++ b/Resources/Locale/en-US/deltav/clothing/belts.ftl @@ -0,0 +1,7 @@ +# Add sidearm and medkit slots to security belts + webbing, medical webbing respectively +clothing-belt-sidearm = Sidearm +clothing-belt-medkit = Medkit + +# Add slots to the daishou +clothing-belt-katana = Katana +clothing-belt-wakizashi = Wakizashi diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml index ecffae4c361..b563757acb5 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml @@ -3,10 +3,12 @@ parent: ClothingBeltKatanaSheath suffix: Filled components: - - type: StorageFill - contents: - - id: Wakizashi - - id: Katana + - type: ContainerFill + containers: + katanaslot: + - Katana + wakizashislot: + - Wakizashi - type: entity id: ClothingBeltCorpsmanWebbingFilled diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml index 8629ddbf613..047383349f6 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml @@ -48,7 +48,23 @@ sprite: DeltaV/Clothing/Belt/corpsman.rsi - type: Clothing sprite: DeltaV/Clothing/Belt/corpsman.rsi + - type: ItemSlots # add medkit slot + slots: + item: + name: clothing-belt-medkit + whitelist: + tags: + - Medkit + insertOnInteract: false # or you can't easily stow medkits in your rig. - type: Storage grid: - 0,0,2,1 - 4,0,7,1 + - type: ItemMapper # add stowed medkit sprite + mapLayers: + medkit: + whitelist: + tags: + - Medkit + sprite: DeltaV/Clothing/Belt/belt_overlay.rsi + - type: Appearance diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index 335749959bf..433335174f0 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -7,85 +7,97 @@ id: BeltSlotNotBelt #not a 'belt' - type: Tag - id: BulletBB + id: BionicSyrinxImplant - type: Tag - id: CartridgeSpecial # For the .38 special ammo and revolver + id: BorgModuleSecurity - type: Tag - id: CartridgeMusket #For the Craftable Musket + id: BorgSecurityArmour - type: Tag - id: Directional + id: BorgSecurityHead - type: Tag - id: DockShipyard + id: BorgSecurityLArm - type: Tag - id: ForensicBeltEquip + id: BorgSecurityLLeg - type: Tag - id: Gavel + id: BorgSecurityRArm - type: Tag - id: GasPipeHalf #Craftable Musket + id: BorgSecurityRLeg - type: Tag - id: HandLabeler + id: BorgSecurityTorso - type: Tag - id: HidesHarpyWings + id: BulletBB - type: Tag - id: MagazinePistolSpecial # For the .38 special ammo and pistol + id: CartridgeSpecial # For the .38 special ammo and revolver - type: Tag - id: ModularBreech #Craftable Musket + id: CartridgeMusket #For the Craftable Musket - type: Tag - id: ModularTrigger #Craftable Musket + id: Directional - type: Tag - id: SecDogWearable # allows Laika to wear meson goggles (and more later?) + id: DockShipyard - type: Tag - id: SpeedLoaderSpecial + id: ForensicBeltEquip - type: Tag - id: PreventLabel + id: Gavel - type: Tag - id: BionicSyrinxImplant + id: GasPipeHalf #Craftable Musket - type: Tag - id: PaperSlip + id: Grenade + +- type: Tag + id: HandLabeler + +- type: Tag + id: HidesHarpyWings - type: Tag id: HudMedicalSecurity #Craftable Corpsman Glasses - type: Tag - id: BorgModuleSecurity + id: MagazinePistolSpecial # For the .38 special ammo and pistol - type: Tag - id: BorgSecurityHead + id: ModularBreech #Craftable Musket - type: Tag - id: BorgSecurityTorso + id: ModularTrigger #Craftable Musket - type: Tag - id: BorgSecurityRLeg + id: PaperSlip - type: Tag - id: BorgSecurityLLeg + id: PreventLabel - type: Tag - id: BorgSecurityRArm + id: SecDogWearable # allows Laika to wear meson goggles (and more later?) - type: Tag - id: BorgSecurityLArm + id: Skirt - type: Tag - id: Skirt + id: SLP # Used for the self-loading pistols - type: Tag - id: BorgSecurityArmour + id: SpeedLoaderSpecial + +- type: Tag + id: Universal # used for the mk32 + +- type: Tag + id: Wakizashi diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 53e541b6bac..a7254a72e54 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -465,6 +465,14 @@ sprite: DeltaV/Clothing/Belt/security.rsi # DeltaV - resprite - type: Clothing sprite: DeltaV/Clothing/Belt/security.rsi # DeltaV - resprite + - type: ItemSlots # DeltaV - add sidearm slot + slots: + item: + name: clothing-belt-sidearm + whitelist: + tags: + - Sidearm + insertOnInteract: false - type: Storage whitelist: tags: @@ -489,21 +497,20 @@ - Whistle - HolosignProjector - BalloonPopper - - type: ItemMapper + - type: ItemMapper # DeltaV - adjust for DeltaV sprites. mapLayers: - flashbang: - whitelist: - components: - - FlashOnTrigger - stunbaton: + baton: whitelist: components: - Stunbaton - tear_gas_grenade: + gasgrenade: + tags: + - Grenade + slp: whitelist: - components: - - SmokeOnTrigger - sprite: Clothing/Belt/belt_overlay.rsi + tags: + - Sidearm + sprite: DeltaV/Clothing/Belt/belt_overlay.rsi - type: Appearance - type: entity @@ -619,10 +626,26 @@ sprite: DeltaV/Clothing/Belt/securitywebbing.rsi # DeltaV - resprite - type: Clothing sprite: DeltaV/Clothing/Belt/securitywebbing.rsi # DeltaV - resprite + - type: ItemSlots # DeltaV - add sidearm slot + slots: + item: + name: clothing-belt-sidearm + whitelist: + tags: + - Sidearm + insertOnInteract: false - type: Storage # Delta-V - Split Inventory grid: - 0,0,2,1 - 4,0,7,1 + - type: ItemMapper # DeltaV - add holstered sidearm sprite + mapLayers: + slp: + whitelist: + tags: + - Sidearm + sprite: DeltaV/Clothing/Belt/belt_overlay.rsi + - type: Appearance # DeltaV - type: entity parent: [ ClothingBeltStorageBase, BaseSecurityCargoContraband ] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index a279c56378f..3de77897c41 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -35,6 +35,9 @@ enum.ConstructionVisuals.Layer: Primed: { state: primed } Unprimed: { state: icon } + - type: Tag # DeltaV - assign grenade tag to all grenades + tags: + - Grenade - type: entity name: explosive grenade diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml index c4736f2a3d7..90fece315dd 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml @@ -37,7 +37,7 @@ sprite: Nyanotrasen/Clothing/Belt/Martial/black.rsi - type: entity - parent: ClothingBeltStorageBase + parent: ClothingBeltBase # DeltaV - reparent from ClothingBeltStorageBase id: ClothingBeltKatanaSheath name: katana sheaths description: An ornate belt designed to hold a pair of samurai's blades, or daisho. @@ -47,18 +47,39 @@ state: sheath - type: Clothing sprite: Nyanotrasen/Clothing/Belt/katanasheath.rsi - - type: Storage - grid: - - 0,0,3,1 - whitelist: - tags: - - Katana - - type: ItemMapper + - type: ItemSlots # DeltaV - adjust how objects are stored + slots: + katanaslot: + name: clothing-belt-katana + insertVerbText: sheath-insert-verb + ejectVerbText: sheath-eject-verb + insertSound: /Audio/Items/sheath.ogg + ejectSound: /Audio/Items/unsheath.ogg + whitelist: + tags: + - Katana + priority: 2 + wakizashislot: + name: clothing-belt-wakizashi + insertVerbText: sheath-insert-verb + ejectVerbText: sheath-eject-verb + insertSound: /Audio/Items/sheath.ogg + ejectSound: /Audio/Items/unsheath.ogg + whitelist: + tags: + - Wakizashi + priority: 1 + - type: ItemMapper # DeltaV - adjust how stored objects are displayed mapLayers: - sheath-sabre: + katana: whitelist: tags: - Katana + wakizashi: + whitelist: + tags: + - Wakizashi + sprite: DeltaV/Clothing/Belt/belt_overlay.rsi - type: Appearance - type: Tag tags: @@ -76,11 +97,27 @@ sprite: DeltaV/Clothing/Belt/cmowebbing.rsi # DeltaV - resprite - type: Item size: Large + - type: ItemSlots # DeltaV - add medkit slot + slots: + item: + name: clothing-belt-medkit + whitelist: + tags: + - Medkit + insertOnInteract: false # or you can't easily stow medkits in your rig. - type: Storage maxItemSize: Normal grid: # DeltaV - Make the grid smaller - 0,0,2,1 - 4,0,7,1 + - type: ItemMapper # DeltaV - add stowed medkit sprite + mapLayers: + medkit: + whitelist: + tags: + - Medkit + sprite: DeltaV/Clothing/Belt/belt_overlay.rsi - type: Tag tags: - BeltSlotNotBelt + - type: Appearance # DeltaV diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml index f2604f044fd..80207feb037 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml @@ -6,7 +6,7 @@ components: - type: Tag tags: - - Katana + - Wakizashi # DeltaV - differentiate between Katana and Wakizashi - type: Sharp - type: Utensil types: diff --git a/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/baton.png b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/baton.png new file mode 100644 index 0000000000000000000000000000000000000000..a9a9e42132800baa9bbd60599265e77f3d79bfa9 GIT binary patch literal 599 zcmV-d0;v6oP)O)gGEDu6hvbfKb~`*mvf#2_E1*KnQeZ^<%>o*81OE|mc7nb zI`QD5pN_a@>hqDgDF2SHdu*!SjjLY&?`t`_*OI0NHka^}rW-}!8R5`IQCGYp?9npu zHQ^)SF+&b0e693Ejb9X}Yy6?uh=ymuu6laYO`K?AEo0<_M}>X4Y)Px1N8O|+nO}@Z z9h5nQNthr3yd)^GPL?9$QuC5oYoEXBTc98wP5wG%3~{8%h<8lXl5|Zh;GUg-N60MyuVXXy!e z3b6nH010qNS#tmY3labT3lag+-G2N40056kL_t(o3GJ0V3cw%?Ms4pPxH(B~;w5`J z=bk{9mUMJWh)pSBx_TE zF@~h}v)2qD#wae%0VV*gwT+YY-g)vFDJAg%^dVhQRr?04U_nkF1GQG)8*m=FkH}0H l8~6l-Sw~0&12FKWfgAE_8o;lYf9e1L002ovPDHLkV1lG026_Mh literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/flashbang.png b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/flashbang.png new file mode 100644 index 0000000000000000000000000000000000000000..f38331684754c4bf7d04a1fd61b77903d145438d GIT binary patch literal 565 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFy>`CI|pPYCo?c;Oe~$a*V`#j z;#hsw(%Od;99^25U7Z_6T#_Z8B=KfVxVp&Pp2=SCyO!cwNAKnf0$abBev!W-wMC4@ zQP9Q2?E6-iJNFhh36<$R-)BFsc;58ldCcDe!cNc3tvm6w+s#7agWl0;d(VYieSENJ ze&3F?SDz>D)cD`GzB*^sz24Pv|KDd@?z%o{8JpSk4^x&&yFQeBc)=|&e2?;*i$)(! zA1XgIbmr5jS^LGMH(q3U_Me3}I@;0?uB)oL>^mnTNjLdPi+gMB&K%Fx^WE<*QJ)## z;~_i6vc+?T0^=SPjg5ZOlpY6to)noqfB&oK1qyP$|EyAZ3YVPhDEGNCsl?aIw{zYU zeecMp|IGc3O)Udo-xF^5mVUZQp6$8bpAenbzi(`+^E>d7W%|#y{R)=8^<8n98T*_I z@(=zDb@qO9@TeJ&&8tG?xT!KmZ&!-!nd_L(^DA#*_R?vgwR11CcjTQCzI)&wW6z1Y z@2~WC_@uw&tl-)Ri~!C8kH}&M25un`X1sK_?hjBf*VDx@B!V+JL4tL$qJb0>m{4hJ zSh@0LJv)2*f0eAovx;UsHJFvuJk!JAVSP;yzopr0GB}TRsaA1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/gasgrenade.png b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/gasgrenade.png new file mode 100644 index 0000000000000000000000000000000000000000..746f83522112a863f5edfd0305a7cece9b73b9d9 GIT binary patch literal 644 zcmV-~0(O)gGEDu6hvbfKb~`*mvf#2_E1*KnQeZ^<%>o*81OE|mc7nb zI`QD5pN_a@>hqDgDF2SHdu*!SjjLY&?`t`_*OI0NHka^}rW-}!8R5`IQCGYp?9npu zHQ^)SF+&b0e693Ejb9X}Yy6?uh=ymuu6laYO`K?AEo0<_M}>X4Y)Px1N8O|+nO}@Z z9h5nQNthr3yd)^GPL?9$QuC5oYoEXBTc98wP5wG%3~{8%h<8lXl5|Zh;GUg-N60MyuVXXy!e z3b6nH010qNS#tmY3labT3lag+-G2N4006v6L_t(o3GI@x4Fe$zMV%-;bO%jFpvoGT zB^ZO6Q7+SD54etonw*iS@1KN}#x9VHkN@WxA}Jvt1cZPP5CTHr&jfBW{f#lrd*4UK z7^luY&B^8=gyx)Uqd&cL2=0go(eTUH_e!-^8WfOw(*itW?0(y4qtPP)rtOKbf0w0u zzV@AR&d}@!k`mRh@zt6ZKx<9b+U}oHVggW>X#q+pq?GEW+@l5U2^n_$0hTpB(EYPk eN(cx6A@Bp#CNLkr`(R-J00001KIqEP)O)gGEDu6hvbfKb~`*mvf#2_E1*KnQeZ^<%>o*81OE|mc7nb zI`QD5pN_a@>hqDgDF2SHdu*!SjjLY&?`t`_*OI0NHka^}rW-}!8R5`IQCGYp?9npu zHQ^)SF+&b0e693Ejb9X}Yy6?uh=ymuu6laYO`K?AEo0<_M}>X4Y)Px1N8O|+nO}@Z z9h5nQNthr3yd)^GPL?9$QuC5oYoEXBTc98wP5wG%3~{8%h<8lXl5|Zh;GUg-N60MyuVXXy!e z3b6nH010qNS#tmY3labT3lag+-G2N400CY}L_t(o31eUY0!c~9{~&rG029b^32~tT zbp+V*DP79{L5?vr&}O7(NPsN^TFUU^<-32NkO0yQ&!0bMqNgLkc7YrL3ISk9{Dg)C zUEF{Y+|ZB!rHP-wkYEGStmiLW{d;|bHOMiHngK^?pIDJX;vX<1{(<1t z0=4`<(D$Iki7Z7w_N~pfv=4Gz-r3P&FmRURa@4RCXC~yU`uchX2L}hnTeog8=0VadK1gtQZsC+L7bfBvxFyLazTNJt37-o1Mnw)6-yun8+O@UlN) zShepr!08N#89|m#nlK=n!07*qoM6N<$f^M>M7XSbN literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/medkit.png b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/medkit.png new file mode 100644 index 0000000000000000000000000000000000000000..b18bfb58fd80336aad7ca6dd824693af2a430d06 GIT binary patch literal 601 zcmV-f0;c_mP)O)gGEDu6hvbfKb~`*mvf#2_E1*KnQeZ^<%>o*81OE|mc7nb zI`QD5pN_a@>hqDgDF2SHdu*!SjjLY&?`t`_*OI0NHka^}rW-}!8R5`IQCGYp?9npu zHQ^)SF+&b0e693Ejb9X}Yy6?uh=ymuu6laYO`K?AEo0<_M}>X4Y)Px1N8O|+nO}@Z z9h5nQNthr3yd)^GPL?9$QuC5oYoEXBTc98wP5wG%3~{8%h<8lXl5|Zh;GUg-N60MyuVXXy!e z3b6nH010qNS#tmY3labT3lag+-G2N4005CmL_t(o31eUw1*0J_8UmvsFd71*Aut*O zqaiRF0)sgOVq#+cV{;!aacpV{i80|*U}a^+uyyNJup`XdkAP_qA0$pKz=F>pd3kvT zb1NGLkmaxV^})2cl`cLlB+KD-z{7_R!3LhJ^kxJ(;$)=_<4L`(|6$@J+eWGeTyc#{ noK*8i)sKe2Xb6mk04M|i5B(>>56&XE00000NkvXXu0mjfXpRKi literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/meta.json new file mode 100644 index 00000000000..c98433227c1 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "katana" + }, + { + "name": "wakizashi" + }, + { + "name": "slp" + }, + { + "name": "universal" + }, + { + "name": "flashbang" + }, + { + "name": "gasgrenade" + }, + { + "name": "baton" + }, + { + "name": "medkit" + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/slp.png b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/slp.png new file mode 100644 index 0000000000000000000000000000000000000000..975d35cc0baa454631f62e980ef24bcb02ed69dd GIT binary patch literal 679 zcmV;Y0$BZtP)O)gGEDu6hvbfKb~`*mvf#2_E1*KnQeZ^<%>o*81OE|mc7nb zI`QD5pN_a@>hqDgDF2SHdu*!SjjLY&?`t`_*OI0NHka^}rW-}!8R5`IQCGYp?9npu zHQ^)SF+&b0e693Ejb9X}Yy6?uh=ymuu6laYO`K?AEo0<_M}>X4Y)Px1N8O|+nO}@Z z9h5nQNthr3yd)^GPL?9$QuC5oYoEXBTc98wP5wG%3~{8%h<8lXl5|Zh;GUg-N60MyuVXXy!e z3b6nH010qNS#tmY3labT3lag+-G2N4007@fL_t(o31eUw1*0J_8UmvsFd71*Aut*O zI6^>KS@S<1pV)sK(o_>>#AXu6axHCbh9BR*Gu*p(k3mX8kwINshe1g}fuX7@3#%S% z<`5&sgiFzj7cUsZ#6=mDl$79>E2$_lFdQ*S5TwT4X>SJ_=;q?_LE!@3(9Yc+yqa)m${rmUB+2k-V3@64A2?+@X0RaK9 z(i=B!5Tk{O)gGEDu6hvbfKb~`*mvf#2_E1*KnQeZ^<%>o*81OE|mc7nb zI`QD5pN_a@>hqDgDF2SHdu*!SjjLY&?`t`_*OI0NHka^}rW-}!8R5`IQCGYp?9npu zHQ^)SF+&b0e693Ejb9X}Yy6?uh=ymuu6laYO`K?AEo0<_M}>X4Y)Px1N8O|+nO}@Z z9h5nQNthr3yd)^GPL?9$QuC5oYoEXBTc98wP5wG%3~{8%h<8lXl5|Zh;GUg-N60MyuVXXy!e z3b6nH010qNS#tmY3labT3lag+-G2N4009O`L_t(o3GI?S3&JoEhEEYqTukc+1qbP- zPC9k&?-uc2XeWz;;KyLQShwg!0@9|%AtJ&Zl(cu3dtaU&00j{s0z`la5P=^PsG0PI z+n0>DRq1%xsh*BAkj*B8%V}@CW190xu90uj;=b<#XDuwt?3TfNK7*d?z+!oq>Gf>Q zL_Kdnf1~&{Nnkn|18;McUMyFT_?d38auy6A`g?YR^(F$wxH5rC+jyrai1=m3iu!X% zB}#8Nl4u4^>0PiTtmhO6=mMT7?zr8riN9+Z-*F*Lg)j^O9~)8m3(5pM&jTTZDo0UN z*7m)85CniGY((V_lnJD1T2`Vw5g-CY;Qt6b080lyT3>?3`2YX_07*qoM6N<$f~OZg AIRF3v literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/wakizashi.png b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/wakizashi.png new file mode 100644 index 0000000000000000000000000000000000000000..817105b0bc48f237bad920cee3929f484406cd1d GIT binary patch literal 646 zcmV;10(t$3P)O)gGEDu6hvbfKb~`*mvf#2_E1*KnQeZ^<%>o*81OE|mc7nb zI`QD5pN_a@>hqDgDF2SHdu*!SjjLY&?`t`_*OI0NHka^}rW-}!8R5`IQCGYp?9npu zHQ^)SF+&b0e693Ejb9X}Yy6?uh=ymuu6laYO`K?AEo0<_M}>X4Y)Px1N8O|+nO}@Z z9h5nQNthr3yd)^GPL?9$QuC5oYoEXBTc98wP5wG%3~{8%h<8lXl5|Zh;GUg-N60MyuVXXy!e z3b6nH010qNS#tmY3labT3lag+-G2N4006#8L_t(o31eUw1*0J_8UmvsFwh|&DJl6M zi2s6UWVh^SF<@Y2WknXE4I60jKSKlUUsJl2LG(``|Ks)+116AduWmP^IEof7V0r%h zITH{ww7vv|z&ADtaUs^bY@a^?9mDnE#x7deiDD)Tj0bcCBb5EWwV#0-=op6Ie??)^ z^rwMo0F*XpZZSBnvDtF_{xfXCqhg~WFd71*Aut*OqaiRF0;3^7^$=jDx`{*>2x@Vg gEB<5He*P;10C}l1W-cVL_5c6?07*qoM6N<$f~CV4IsgCw literal 0 HcmV?d00001 From e8f213ab2ceabb03fa0e334f400e81433ef4a06d Mon Sep 17 00:00:00 2001 From: TadJohnson00 Date: Fri, 20 Sep 2024 20:04:28 +1000 Subject: [PATCH 02/11] Remove unnecessary tags --- Resources/Prototypes/DeltaV/tags.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index 433335174f0..e8fdf22add2 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -90,14 +90,8 @@ - type: Tag id: Skirt -- type: Tag - id: SLP # Used for the self-loading pistols - - type: Tag id: SpeedLoaderSpecial -- type: Tag - id: Universal # used for the mk32 - - type: Tag id: Wakizashi From 9f91297c4acc23472f20b8b7d035117bab86c287 Mon Sep 17 00:00:00 2001 From: TadJohnson00 Date: Fri, 20 Sep 2024 20:21:14 +1000 Subject: [PATCH 03/11] Add whitelist to first aid kits --- .../Entities/Objects/Specific/Medical/medkits.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml index 82f91669cd1..1f830807ee4 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml @@ -7,7 +7,19 @@ - type: Sprite sprite: Objects/Specific/Medical/firstaidkits.rsi state: firstaid - - type: Storage + - type: Storage # DeltaV - add whitelist to first aid kits + whitelist: + tags: + - Brutepack + - Ointment + - Bloodpack + - Gauze + - PillCanister + - Syringe + - BreathMask + - GasTank + components: + - Hypospray maxItemSize: Small grid: - 0,0,3,1 From 37dc880c316be4d6a0806df66d61e532578f4bb5 Mon Sep 17 00:00:00 2001 From: TadJohnson00 Date: Fri, 20 Sep 2024 20:23:40 +1000 Subject: [PATCH 04/11] Adjust medkit whitelist --- .../Entities/Objects/Specific/Medical/medkits.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml index 1f830807ee4..bb1bcb223fd 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml @@ -10,15 +10,15 @@ - type: Storage # DeltaV - add whitelist to first aid kits whitelist: tags: - - Brutepack - - Ointment - Bloodpack + - Brutepack - Gauze + - GasTank + - Ointment - PillCanister - Syringe - - BreathMask - - GasTank components: + - BreathMask - Hypospray maxItemSize: Small grid: From ba44ecec3e8664aaf91a408f5f7d1593cd45977b Mon Sep 17 00:00:00 2001 From: TadJohnson00 Date: Fri, 20 Sep 2024 20:27:26 +1000 Subject: [PATCH 05/11] Add bottle-tagged items to medkit whitelist --- .../Prototypes/Entities/Objects/Specific/Medical/medkits.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml index bb1bcb223fd..71167106029 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml @@ -11,6 +11,7 @@ whitelist: tags: - Bloodpack + - Bottle - Brutepack - Gauze - GasTank From 409b9953ba7251733cf6d73df55e21cc802b668f Mon Sep 17 00:00:00 2001 From: TadJohnson00 Date: Fri, 20 Sep 2024 20:39:56 +1000 Subject: [PATCH 06/11] Grenade tag already exists pro --- Resources/Prototypes/DeltaV/tags.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index e8fdf22add2..3f5aca90d4e 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -57,9 +57,6 @@ - type: Tag id: GasPipeHalf #Craftable Musket -- type: Tag - id: Grenade - - type: Tag id: HandLabeler From 9bd7ccef3a641ebe9c659955e5d7b6f421baf0f5 Mon Sep 17 00:00:00 2001 From: TadJohnson00 Date: Fri, 20 Sep 2024 20:45:33 +1000 Subject: [PATCH 07/11] tj is an idiot --- Resources/Prototypes/Entities/Clothing/Belt/belts.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index a7254a72e54..fce182f0216 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -504,8 +504,9 @@ components: - Stunbaton gasgrenade: - tags: - - Grenade + whitelist: + tags: + - Grenade slp: whitelist: tags: From 3d548fa41d6ad8e8b285833618c1236cc5f86f49 Mon Sep 17 00:00:00 2001 From: TadJohnson00 Date: Fri, 20 Sep 2024 21:01:05 +1000 Subject: [PATCH 08/11] b&t debug wtaf are you yappin about --- Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml | 2 +- Resources/Prototypes/Entities/Clothing/Belt/belts.yml | 4 ++-- .../Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml index 047383349f6..494d6cf679c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml @@ -50,7 +50,7 @@ sprite: DeltaV/Clothing/Belt/corpsman.rsi - type: ItemSlots # add medkit slot slots: - item: + medkit: name: clothing-belt-medkit whitelist: tags: diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index fce182f0216..eccb1eaa08e 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -467,7 +467,7 @@ sprite: DeltaV/Clothing/Belt/security.rsi # DeltaV - resprite - type: ItemSlots # DeltaV - add sidearm slot slots: - item: + holster: name: clothing-belt-sidearm whitelist: tags: @@ -629,7 +629,7 @@ sprite: DeltaV/Clothing/Belt/securitywebbing.rsi # DeltaV - resprite - type: ItemSlots # DeltaV - add sidearm slot slots: - item: + holster: name: clothing-belt-sidearm whitelist: tags: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml index 90fece315dd..4cc9c6639d4 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml @@ -99,7 +99,7 @@ size: Large - type: ItemSlots # DeltaV - add medkit slot slots: - item: + medkit: name: clothing-belt-medkit whitelist: tags: From 75cfe8c9bb42cf30a03b5ed647830c4364068ff6 Mon Sep 17 00:00:00 2001 From: TadJohnson00 Date: Fri, 20 Sep 2024 21:19:19 +1000 Subject: [PATCH 09/11] Give belts another parent, ClothingSlotBase --- Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml | 2 +- Resources/Prototypes/Entities/Clothing/Belt/belts.yml | 4 ++-- .../Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml index 494d6cf679c..5e39dedca39 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml @@ -39,7 +39,7 @@ - type: Appearance - type: entity - parent: ClothingBeltStorageBase + parent: [ClothingBeltStorageBase, ClothingSlotBase] id: ClothingBeltCorpsmanWebbing name: corpsman webbing description: A set of security webbing with blue corpsman highlights. diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index eccb1eaa08e..3d9c089a09c 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -456,7 +456,7 @@ - type: Appearance - type: entity - parent: [ClothingBeltStorageBase, BaseRestrictedContraband] + parent: [ClothingBeltStorageBase, BaseRestrictedContraband, ClothingSlotBase] # DeltaV - add parent ClothingSlotBase id: ClothingBeltSecurity name: security belt description: Can hold security gear like handcuffs and flashes. @@ -618,7 +618,7 @@ - CartridgeAmmo - type: entity - parent: ClothingBeltStorageBase + parent: [ClothingBeltStorageBase, ClothingSlotBase] # DeltaV - add parent ClothingSlotBase id: ClothingBeltSecurityWebbing name: security chest rig # DeltaV - rename from "security carrier" due to already existing plate carrier description: Unique and versatile chest rig, can hold security gear. diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml index 4cc9c6639d4..74ea802c7d3 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml @@ -86,7 +86,7 @@ - BeltSlotNotBelt - type: entity - parent: ClothingBeltStorageBase + parent: [ClothingBeltStorageBase, ClothingSlotBase] # DeltaV - add parent ClothingSlotBase id: ClothingBeltMilitaryWebbingCMO name: chief medical officer's chest rig description: A medical chest rig with deep pockets, for use by paramedics and health professionals. From c92ae285baf543f1da74b5b9509a76ef08eedffe Mon Sep 17 00:00:00 2001 From: TadJohnson00 Date: Fri, 20 Sep 2024 22:01:52 +1000 Subject: [PATCH 10/11] contain uncontained containers --- .../DeltaV/Entities/Clothing/Belt/belts.yml | 5 +++++ Resources/Prototypes/Entities/Clothing/Belt/belts.yml | 10 ++++++++++ .../Nyanotrasen/Entities/Clothing/Belt/belts.yml | 11 +++++++++++ 3 files changed, 26 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml index 5e39dedca39..cef0cf394c1 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml @@ -67,4 +67,9 @@ tags: - Medkit sprite: DeltaV/Clothing/Belt/belt_overlay.rsi + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + medkit: !type:ContainerSlot {} - type: Appearance diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 3d9c089a09c..17bd290d72a 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -512,6 +512,11 @@ tags: - Sidearm sprite: DeltaV/Clothing/Belt/belt_overlay.rsi + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + holster: !type:ContainerSlot {} - type: Appearance - type: entity @@ -646,6 +651,11 @@ tags: - Sidearm sprite: DeltaV/Clothing/Belt/belt_overlay.rsi + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + holster: !type:ContainerSlot {} - type: Appearance # DeltaV - type: entity diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml index 74ea802c7d3..20be122b4f2 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml @@ -80,6 +80,12 @@ tags: - Wakizashi sprite: DeltaV/Clothing/Belt/belt_overlay.rsi + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + katana: !type:ContainerSlot {} + wakizashi: !type:ContainerSlot {} - type: Appearance - type: Tag tags: @@ -120,4 +126,9 @@ - type: Tag tags: - BeltSlotNotBelt + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + medkit: !type:ContainerSlot {} - type: Appearance # DeltaV From 34a4a67b81cdf31948f934d5c8a0f6ccad8df833 Mon Sep 17 00:00:00 2001 From: TadJohnson00 Date: Fri, 20 Sep 2024 22:15:30 +1000 Subject: [PATCH 11/11] tj dumb fuck --- .../Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml index 20be122b4f2..badf017ff5e 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml @@ -84,8 +84,8 @@ containers: storagebase: !type:Container ents: [] - katana: !type:ContainerSlot {} - wakizashi: !type:ContainerSlot {} + katanaslot: !type:ContainerSlot {} + wakizashislot: !type:ContainerSlot {} - type: Appearance - type: Tag tags: