From 4d3c085eb762a6d9e2e7df1aac1be8029f2c8d39 Mon Sep 17 00:00:00 2001 From: Lamrr <96937466+Lamrr@users.noreply.github.com> Date: Tue, 8 Feb 2022 21:01:16 +1100 Subject: [PATCH] Adds dedicated salvage specialist role (#6451) --- Resources/Prototypes/AccessLevels/cargo.yml | 3 ++ .../Catalog/Fills/Lockers/cargo.yml | 20 ++++++++++++++ .../Catalog/Fills/Lockers/wardrobe_job.yml | 13 +++++++++ .../Entities/Clothing/Shoes/boots.yml | 12 ++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 19 +++++++++++-- .../Entities/Markers/Spawners/jobs.yml | 12 ++++++++ .../Entities/Objects/Devices/pda.yml | 15 ++++++++++ .../Objects/Misc/identification_cards.yml | 12 ++++++++ .../Entities/Objects/Weapons/Melee/knife.yml | 15 ++++++++++ .../Structures/Doors/Airlocks/access.yml | 18 +++++++++++- .../Storage/Closets/Lockers/lockers.yml | 15 ++++++++++ .../Structures/Storage/Closets/wardrobe.yml | 6 ++++ .../Roles/Jobs/Cargo/quartermaster.yml | 1 + .../Roles/Jobs/Cargo/salvage_specialist.yml | 24 ++++++++++++++++ .../Prototypes/Roles/Jobs/Command/captain.yml | 2 ++ .../Roles/Jobs/Command/head_of_personnel.yml | 1 + .../Boots/explorer.rsi/equipped-FEET.png | Bin 0 -> 447 bytes .../Shoes/Boots/explorer.rsi/icon.png | Bin 0 -> 345 bytes .../Shoes/Boots/explorer.rsi/inhand-left.png | Bin 0 -> 339 bytes .../Shoes/Boots/explorer.rsi/inhand-right.png | Bin 0 -> 347 bytes .../Shoes/Boots/explorer.rsi/meta.json | 26 ++++++++++++++++++ .../salvage.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1279 bytes .../Uniforms/Jumpsuit/salvage.rsi/icon.png | Bin 0 -> 515 bytes .../Jumpsuit/salvage.rsi/inhand-left.png | Bin 0 -> 495 bytes .../Jumpsuit/salvage.rsi/inhand-right.png | Bin 0 -> 516 bytes .../Uniforms/Jumpsuit/salvage.rsi/meta.json | 26 ++++++++++++++++++ .../survival_knife.rsi/equipped-BELT.png | Bin 0 -> 171 bytes .../Weapons/Melee/survival_knife.rsi/icon.png | Bin 0 -> 371 bytes .../Melee/survival_knife.rsi/inhand-left.png | Bin 0 -> 308 bytes .../Melee/survival_knife.rsi/inhand-right.png | Bin 0 -> 306 bytes .../Melee/survival_knife.rsi/meta.json | 26 ++++++++++++++++++ 31 files changed, 263 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml create mode 100644 Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json diff --git a/Resources/Prototypes/AccessLevels/cargo.yml b/Resources/Prototypes/AccessLevels/cargo.yml index 4f42b57183..57244f1312 100644 --- a/Resources/Prototypes/AccessLevels/cargo.yml +++ b/Resources/Prototypes/AccessLevels/cargo.yml @@ -3,3 +3,6 @@ - type: accessLevel id: Cargo + +- type: accessLevel + id: Salvage diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml new file mode 100644 index 0000000000..9e3cebe5e0 --- /dev/null +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -0,0 +1,20 @@ +- type: entity + id: LockerSalvageSpecialistFilled + suffix: Filled + parent: LockerSalvageSpecialist + components: + - type: StorageFill + contents: +# Should be moved to a suit storage unit when/if they are added. + - id: ClothingOuterHardsuitSalvage + - id: YellowOxygenTank + - id: ClothingShoesBootsMag + - id: ClothingHeadHelmetHardsuitSalvage + - id: ClothingMaskGas +# Currently do not function as 'true' mesons, so they're useless for salvagers. +# - id: ClothingEyesGlassesMeson + - id: ClothingBeltUtilityFilled + - id: FlashlightSeclite + - id: SurvivalKnife + + diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml index bb5bdf7139..e773a43cd3 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml @@ -187,6 +187,19 @@ - id: ClothingHandsGlovesFingerless amount: 1 + - type: entity + id: WardrobeSalvageFilled + suffix: Filled + parent: WardrobeSalvage + components: + - type: StorageFill + contents: + - id: ClothingBackpack + amount: 1 + - id: ClothingShoesBootsSalvage + amount: 2 + - id: ClothingUniformJumpsuitSalvageSpecialist + amount: 2 # - type: entity # id: WardrobeAtmosphericsFilled diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index debbfa32c6..8c6c1a6cc4 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -19,3 +19,15 @@ sprite: Clothing/Shoes/Boots/jackboots.rsi - type: Clothing sprite: Clothing/Shoes/Boots/jackboots.rsi + +- type: entity + parent: ClothingShoesBase + id: ClothingShoesBootsSalvage + name: salvage boots + description: Steel-toed salvage boots for salvaging in hazardous environments. + components: + - type: Sprite + sprite: Clothing/Shoes/Boots/explorer.rsi + - type: Clothing + sprite: Clothing/Shoes/Boots/explorer.rsi + diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index d2eee13dfa..9b7baa1ac7 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -53,6 +53,21 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSalvageSpecialist + name: salvage specialist's jumpsuit + description: It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 # Those overalls ARE sturdy. + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitChiefEngineer @@ -646,7 +661,7 @@ sprite: Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi - + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitPyjamaSyndicateBlack @@ -678,4 +693,4 @@ - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi \ No newline at end of file + sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 53392939a8..f89e829e2d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -58,6 +58,18 @@ - state: green - state: cargo_tech +- type: entity + id: SpawnPointSalvageSpecialist + parent: SpawnPointJobBase + name: salvagespecialist + components: + - type: SpawnPoint + job_id: SalvageSpecialist + - type: Sprite + layers: + - state: green + - state: miner + # Civilian - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 720fb9de50..3105e946ef 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -203,6 +203,21 @@ - type: Icon state: pda-cargo +- type: entity + parent: BasePDA + id: SalvagePDA + name: salvage PDA + description: Smells like ash. + components: + - type: PDA + id: SalvageIDCard + - type: Appearance + visuals: + - type: PDAVisualizer + state: pda-miner + - type: Icon + state: pda-miner + - type: entity parent: BasePDA id: BartenderPDA diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index c72718561c..e95b745719 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -118,6 +118,18 @@ - type: PresetIdCard job: CargoTechnician +- type: entity + parent: IDCardStandard + id: SalvageIDCard + name: salvage ID card + components: + - type: Sprite + layers: + - state: default + - state: idshaftminer + - type: PresetIdCard + job: SalvageSpecialist + - type: entity parent: IDCardStandard id: QuartermasterIDCard diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index c177f0c6f2..7e2296b5e5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -88,3 +88,18 @@ size: 10 sprite: Objects/Weapons/Melee/combat_knife.rsi prefix: inhand + +- type: entity + name: survival knife + parent: CombatKnife + id: SurvivalKnife + description: Weapon of first and last resort for combatting space carp. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/survival_knife.rsi + size: 2 + state: icon + - type: Item + size: 10 + sprite: Objects/Weapons/Melee/survival_knife.rsi + prefix: inhand diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index e9d356fa3d..aeb892242a 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -95,6 +95,14 @@ components: - type: AccessReader access: [["Cargo"]] + +- type: entity + parent: AirlockCargo + id: AirlockSalvageLocked + suffix: Salvage, Locked + components: + - type: AccessReader + access: [["Salvage"]] - type: entity parent: AirlockCargo @@ -296,7 +304,15 @@ components: - type: AccessReader access: [["Cargo"]] - + +- type: entity + parent: AirlockCargoGlass + id: AirlockSalvageGlassLocked + suffix: Salvage, Locked + components: + - type: AccessReader + access: [["Salvage"]] + - type: entity parent: AirlockCargoGlass id: AirlockQuartermasterGlassLocked diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 277a0cb892..1537a5bc08 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -34,6 +34,21 @@ - type: AccessReader access: [["Quartermaster"]] +- type: entity + id: LockerSalvageSpecialist + parent: LockerBase + name: salvage specialist's equipment + description: Nevermind the pickaxe. + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: mining + state_open: mining_open + state_closed: mining_door + - type: AccessReader + access: [["Salvage"]] + # Command - type: entity id: LockerCaptain diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml index 6cf536ece3..e58d55547d 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml @@ -193,6 +193,12 @@ parent: WardrobePrison name: cargo wardrobe +- type: entity + id: WardrobeSalvage + parent: WardrobeMixed + name: salvage wardrobe + description: Notably not salvaged. + - type: entity id: WardrobeEngineering parent: WardrobeYellow diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 73bb8d2a95..e854df3d81 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -8,6 +8,7 @@ supervisors: "the head of personnel" access: - Cargo + - Salvage - Quartermaster - Maintenance - External diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml new file mode 100644 index 0000000000..c47161be33 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -0,0 +1,24 @@ +- type: job + id: SalvageSpecialist + name: "salvage spationaut" + icon: "ShaftMiner" + startingGear: SalvageSpecialistGear + departments: + - Cargo + supervisors: "the quartermaster and head of personnel" + access: + - Cargo + - Salvage + - Maintenance + - External + +- type: startingGear + id: SalvageSpecialistGear + equipment: + jumpsuit: ClothingUniformJumpsuitSalvageSpecialist + back: ClothingBackpackFilled + shoes: ClothingShoesBootsSalvage + id: SalvagePDA + ears: ClothingHeadsetCargo + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index cedf91c673..9621655fa2 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -15,6 +15,7 @@ # Could probably do with some kind of wildcard or whatever to automate this. # HELL FUCKING YEAH WE COULD # Guys please don't fight + # Seriously though... - Captain - HeadOfPersonnel - ChiefEngineer @@ -28,6 +29,7 @@ - Engineering - Medical - Quartermaster + - Salvage - Cargo - Research - Service diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 295fbe74ae..33574f8932 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -15,6 +15,7 @@ - Security # HoPcurity strikes again - Service - Quartermaster + - Salvage - Cargo - Maintenance - Janitor diff --git a/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..496acfef2a5f4ebe804dc414a4bd62153e0bfe19 GIT binary patch literal 447 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~KbraSW-r_4d}rtY!xZ_7C+= z1tL+a@`^l+zAjU;b0~N{EB(dguYz6t0Yug5S_Vw}E*U}$1COeAm|IT!rDPhv1*S){y@$CI+G0Cc6P1@#FD}WAOG3)22 zpPYxbem$OUC27J~{P6YFB1VQA&)IWM?<%g3zQ!TL-G7hSsiMN)AVcVp$E$#>{_~;#)~YSS6H=^M`dBYp8yw3tFbq4*dW%=M_Ux~`do_(Jw;iXHE>ElX_pNuj f^_K6Y^l$dZr}i(BncHv-7%>cZq}7=<4dYZwwlx5iS!<`HoK#1S}V&(ISvW^0g4wjja)E0R0evcVwP9XizC0@lNR zKmY$^z~k|FJpY}*cEgo?Z~!1l1OQ;&xcbJV-PyzF^=4yU=9E`OD%Y$VQ5C5)G-=u8 z2$Dpy@Fk&50jwJlxB3>=zKrjt^{+c{XOEztW>iHg|FEBCuxf?d`cT7TV|6_o@h|0?M57 zjJ|83s+$4X<%qf&^wcXFIiIv5oH|hEl*b2iM1+xvewq;7l$ib9q@QOo!(o*5K&*4}nM``*oYwHnjeQZj>%1-efPITL=X$Nc

zN%7Tt=Z*)azwfWQI{(xb#>iPyn(O?3=B&JaUZ3}ut!I#3bXJtko!9>l)v)u#+o^b# z-_5YLOSc8P2t@D|?3VeOHdQ_&g<0n_^SYl5`C>mC-QF>r)U!{hvwm~d%KpL%wu&e0 hQdb!|{{Yo**vuC2Z~o4u-kEwJ?VhfFF6*2UngGAci`W1F literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..3240c04579892dd01876d94373f961ac639c9848 GIT binary patch literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU{vySaSW-L^Y+%>tV013$38B1 zb<|+n?o+B$a$?2wq;(Ee;!eflOT#ZL41ajzqTW?*j)RVYE(@KlWHU`Jsz{y4{J;O@ zlPAsU&y%gzvj9zHVEAzUPRd=58hyXl@_T)a?ysD@=Vx%e+K0V2N~0z%$=EtMbN1_9 z{7w`9Y+r6CvbL=ATl4K}MW1WG9tb@-*}hmUzHRRn)h}Ou1-`y%{^?o1j9tRFbKyI} zp0C^azI<+2lFRE=8UKzju5GM7pW02v9!hXfWIk-z z!iJ-)PzZq`tS`2M{ed~h9K?a6gn|%PU7;GSOVjI;ZkpXa=)K;=_~%}8(?QP%F5H}( zS5^Z!->XA^W51?dvj03Q(@7k+)T1jw3J#RR! zo6xxArzO}9z!CL4X(dro6N>3?haLSrO@XwMARe3Km2fvuK`7iqDDN5905}kCC4TWe zf(j5T-3Tbu*V_uQqwm_y{h-pybbK6u+p~`V`2IU}%VEAg9UmvCwC;NpY^NUz_YjXw z0uYZ)5(@X&*57psOvlGr%~Vjhu)Owqm2sH4$~kE@Q(+XnUkdf7Vp#zCMu!Q7d*~Y- z#@udIf5$11VgWJ$X`}7eUou6XYi=+0Iy)45pIlC3DwgG#Qem`B#j@mbnl1eu4YyKqw+Vyo-+3tOG6U>k8>btEL^X2+3Fq$qiRKwz@ZB{Y&t-BndDllGO>oQmk7a$!Q{aux zr}7pb^I{YoNjW|R<}x{>hFc>kp5HjXar2?`Q^4GD^XD#*XM~e9_&nUW`H=KqIm7ho zLoy9MkI`lYm)$~c&pu)xl9bFQl!IeR1r0tA00WVvq?=;*2Do^_5eC?u|9fpOHKo?K zvG(Jy$jb^uN6Iq=KK}IUjk9Y;Eeg-sGt}w} z(n^Br*ru3yleAozHO<@eX(a)1hYgsHkJF-%CuA;SAd+;n^QYcET-1oPlCYIYaM>OH zP`-bHcS6r4*bQV@8Ub}DhgkmVU0&`R-fXLO8+Rg^a(;_EI+7xAc)e^rm!Q}4(@Rpdcr-krl|^b$+KUJNX5%h0R<7-py;Ze|x!OaTZ$6 z@?1C_(4KX#ulg^&wdvnfEX%2jb5c2`Ks4N>nRkOHuCMp{&YEiM7&|rs1|mu6!f6Z> zie&|yrdTe)PUmfZ3>GWMj<{V)nM)Ac7>rsOj4QMW6AQ?oY^cIoaA{w+6g}RGF5p3aA3=B;}#0l=d~4DivP7^S~LS-R9eyvLOu0LWxZwCg_BJ{7KM&-(mivLzbb zD8T{~(pGx&n#1zC%2s+4SDLVV=+`eNH|k}(Yh!qofFdf&5Ksg{NOyXOZk>VEMAQN} zDqh%51B#%bz8WDUe*ZnM*mv(4$Ye{Tc3NpVZ6Xv3p{gqJc$`!!g<%-v^LcW)9Pq=v zDH!kh#h&>SE`S3tKCa>WvrQC;HbVHZOePDi_Q2rtIsm?tknA2C_X_x=y2r*A lK&pFe+-K0o?lBQb_y%g45w^hGG*bWo002ovPDHLkV1h^T*n(J%7Vu6}3JwNBUEM2lVSFCpC;!kNu z7=eb|N-He1k*Hx{;8EUQa_{L^?OogR_ubE*Jwu%1oXoWA_4B#8CEWP<<;5BDraiml zvgg6~O|4aadh6FS><=y4!`*j0`HFwtv%AlAc>mi?u*rWQ_h6n**m+yO(?@qtdcs@B zJ?E{ynNYdl`$zYFns`hyFW_frxcG;o`kbbTZ}ZKJ1=lYd%=9ssW&coO^H!Gl<)NS3 z#2)OiX`Q!|ec6GzwXJ^+>V1-Yu;EYZ^yj`YPDZPr@z$FC+m*YkfBwo_%nV;Y2?;{M zN{6j|8+$H1Tj2qubzU+tyejQU^{CYgTbnH7o{{XbBzopr E02B4#(*OVf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json new file mode 100644 index 0000000000..df7a468a95 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0a1ae39f0fb7353b0704f27d1599a567891f727c", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..288f9fbce59d7a56a909028c037368f4f8f92e12 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MV>B>Ar*7p-f|Q?#K7ZnF|>h+ z<%*wZC^y%RYm7`24)B;YHO5(#TK%5a^e1LA3sA=c|JRc&tJ^NG@qSjP9qUl~=ggVn z`m@_?e~BsVGqv-)H$Ok$2B-`O*#GcsnRj;e13Mm^y0^lJpOXFi4&$yT^`SI;$+6Z`Y%tclyzR%{%Mksv#;~G@I9okVNTDp zdNv@4xG*`%@@OE#XUm<_f<>54*oi+7PVhK+Qu$`lrp84(E`b%LrvCkZtnJ(X<>zC6 z&ktyHo+>b5%CukkX^&16{Ci`$>gSw^cWVAUxhTAf#oBn~H0}?a26uMUPIC+np5HjP zyZezvy5iMO>Fe{1Jvvt!&9T}%-)`$nko_QI^Yk45t1eyoZ}Dj@6 z{rrTAe_tf8Zk7<_z{}NpA@#_;UZ(Xf( zXU+$22sOB9{NRz!c^}P_3`IS?J1mTYj4vB|Da?5^>ByuIgeE9_VDuX%whi!$u#YW;^o%G2?~u20>(<*4MOaTnVa~%_;`Fg xJlnQ1x+tki8XK(ayUmxTk?XKdnVp4!p>h(t_0o;2?f~s#@O1TaS?83{1OVVQVdMY+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ac3aec224798ca7e6e259498456b238cab53aa38 GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSJOMr-uK)l4udA!OfB(Lbkx}5K zmpMRj#*!evU)e_1!5cyiE*d|0q;uX!^CUx2Pwx&3;~?Y9#$F0@9!)wjDMTSy(^}tHH?*_cSatIX zi6uaKt%jkw=n=CgL16`7iy5W48O;5pq_^al1Ojc1^K@|xvFJ@ska&22apqyBBaA1Q zlpJhWBNdoBLMQ&{;dE&F%;40popH6P4aYOaHC%27AF%TAOjyFm+@ru4rowoQP2u3n x1_1$PK_3s#muxfUG~ecnV6t?WC(I5E6H@~Y+j^$m@j#mxJYD@<);T3K0RVbSXzl<2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json new file mode 100644 index 0000000000..455734e044 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/6cdc0503d32e249125151e369edf951e93bccd1a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +}