diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/courier.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/courier.yml index 6785e74acb..35bd1f79f5 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/courier.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/courier.yml @@ -11,3 +11,7 @@ innerClothingSkirt: ClothingUniformSkirtCourier satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml index 7d7943ab69..0e8adf9760 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml @@ -19,7 +19,10 @@ pocket1: Brutepack pocket2: GlowstickBase belt: ClothingBeltMedical - + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite - type: startingGear id: OldstationGuard @@ -29,6 +32,10 @@ id: SecurityIDCard pocket1: Flash pocket2: GlowstickBase + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite - type: startingGear id: OldstationEngi @@ -41,6 +48,10 @@ pocket1: EmergencyOxygenTankFilled pocket2: GlowstickBase belt: ClothingBeltUtility + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite - type: startingGear id: OldstationScientist @@ -50,6 +61,10 @@ id: ResearchIDCard pocket1: Pen pocket2: GlowstickBase + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite #Syndicate Pirate Radio Listener @@ -63,6 +78,10 @@ shoes: ClothingShoesSlippers id: SyndiListeningPostPDA innerClothingSkirt: ClothingUniformJumpsuitPyjamaSyndicatePink + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite # Mobsters @@ -80,6 +99,10 @@ innerClothingSkirt: ClothingUniformJumpsuitSuitBlackMob satchel: ClothingBackpackMafiaFilled duffelbag: ClothingBackpackMafiaFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite - type: startingGear id: MobsterGearAlt @@ -96,3 +119,7 @@ innerClothingSkirt: ClothingUniformJumpsuitSuitBrown satchel: ClothingBackpackMafiaFilled duffelbag: ClothingBackpackMafiaFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml index 0ba8f0bb7c..be9103f358 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml @@ -51,5 +51,8 @@ innerClothingSkirt: ClothingUniformJumpskirtChiefJustice satchel: ClothingBackpackSatchelFilled # TODO- make Justice departmebt bags duffelbag: ClothingBackpackDuffelFilled - + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml index c2032b67eb..089a8267b2 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml @@ -37,5 +37,8 @@ innerClothingSkirt: ClothingUniformJumpskirtClerk satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled - + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml index e0cebc4417..356966fe9b 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml @@ -30,5 +30,8 @@ innerClothingSkirt: ClothingUniformJumpskirtProsecutor satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled - + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml index e2dee4f874..697682d863 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml @@ -44,6 +44,10 @@ ears: ClothingHeadsetBrigmedic belt: ClothingBeltCorpsmanWebbingFilled pocket1: WeaponPistolMk58Nonlethal + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite innerClothingSkirt: ClothingUniformJumpskirtBrigmedic satchel: ClothingBackpackSatchelBrigmedicFilled duffelbag: ClothingBackpackDuffelBrigmedicFilled diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 0ff87f3e73..e70c8e67b7 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -69,30 +69,14 @@ - type: BreathMask - type: Sprite sprite: Clothing/Head/Hardsuits/spatiohelm.rsi - layers: - - state: icon - - state: icon-unshaded - shader: unshaded - - state: light-overlay - visible: false - shader: unshaded - map: [ "light" ] - - type: HandheldLight - addPrefix: false - - type: ToggleableLightVisuals - clothingVisuals: - head: - - state: equipped-head-light - shader: unshaded - type: Clothing - clothingVisuals: - head: - - state: equipped-head - - state: equipped-head-unshaded - shader: unshaded + sprite: Clothing/Head/Hardsuits/spatiohelm.rsi - type: PressureProtection highPressureMultiplier: 0.72 lowPressureMultiplier: 1000 + - type: PointLight + radius: 7 + energy: 3 #Salvage Hardsuit - type: entity diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml index 5a90e77a58..27446cac50 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml @@ -24,3 +24,7 @@ innerClothingSkirt: ClothingUniformSkirtMailCarrier satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml index 2617f782af..42a2d36c91 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml @@ -46,3 +46,7 @@ innerClothingSkirt: ClothingUniformSkirtMantis satchel: ClothingBackpackSatchelMantisFilled duffelbag: ClothingBackpackDuffelMantisFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml index fec6ac685e..f583b17ee7 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml @@ -39,3 +39,7 @@ innerClothingSkirt: ClothingUniformJumpsuitPrisonGuard satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml index 3651d223d7..4d266d07a7 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml @@ -32,4 +32,8 @@ id: GladiatorPDA ears: ClothingHeadsetGrey innerClothingSkirt: UniformShortsRedWithTop + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite #any other possessions, spawn in cell diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml index 8c3c80c72f..b985d03091 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml @@ -37,3 +37,7 @@ gloves: ClothingHandsGlovesBoxingRed satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml index 00ffdde666..9e8a351cb3 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml @@ -22,3 +22,7 @@ id: PrisonerPDA ears: ClothingHeadsetPrison #deltaV innerClothingSkirt: ClothingUniformJumpsuitPrisoner + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index 3a1aa659bc..f7dd17a9c4 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -30,3 +30,7 @@ innerClothingSkirt: ClothingUniformJumpskirtCargo satchel: ClothingBackpackSatchelCargoFilled duffelbag: ClothingBackpackDuffelCargoFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index ee1a101154..48b0212012 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -55,3 +55,7 @@ innerClothingSkirt: ClothingUniformJumpskirtQM satchel: ClothingBackpackSatchelQuartermasterFilled duffelbag: ClothingBackpackDuffelQuartermasterFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 8b806009ef..e331ad0d61 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -29,3 +29,7 @@ ears: ClothingHeadsetCargo satchel: ClothingBackpackSatchelSalvageFilled duffelbag: ClothingBackpackDuffelSalvageFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml index 5cf4fd9449..bf91403d35 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml @@ -20,3 +20,7 @@ innerClothingSkirt: ClothingUniformJumpskirtColorGrey satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index 85a86dabce..9bd908f78f 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -31,3 +31,7 @@ innerClothingSkirt: ClothingUniformJumpskirtBartender satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml index 35b858fb38..48483cde77 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml @@ -27,3 +27,7 @@ innerClothingSkirt: ClothingUniformJumpskirtHydroponics satchel: ClothingBackpackSatchelHydroponicsFilled duffelbag: ClothingBackpackDuffelHydroponicsFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index a3f6c9d0c9..cba3c83d7f 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -32,3 +32,7 @@ innerClothingSkirt: ClothingUniformJumpskirtChaplain satchel: ClothingBackpackSatchelChaplainFilled duffelbag: ClothingBackpackDuffelChaplainFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index 0837f1f390..0850cef8c2 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -37,3 +37,7 @@ innerClothingSkirt: ClothingUniformJumpskirtChef satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index 141f4d39b7..7b668780ac 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -43,3 +43,7 @@ ears: ClothingHeadsetService satchel: ClothingBackpackSatchelClownFilled duffelbag: ClothingBackpackDuffelClownFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml index bf11532ddb..fff6c4fc22 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -43,3 +43,7 @@ innerClothingSkirt: ClothingUniformJumpskirtJanimaid satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 67afdf8aff..75a488fcc0 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -32,3 +32,7 @@ innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack satchel: ClothingBackpackSatchelLawyerFilled #DeltaV - stamp included duffelbag: ClothingBackpackDuffelLawyerFilled #DeltaV - stamp included + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index 26048bec05..17f4570a62 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -37,3 +37,7 @@ innerClothingSkirt: ClothingUniformJumpskirtLibrarian satchel: ClothingBackpackSatchelLibrarianFilled duffelbag: ClothingBackpackDuffelLibrarianFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index c7c659bc53..7fac7a9164 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -36,6 +36,10 @@ innerClothingSkirt: ClothingUniformJumpskirtMime satchel: ClothingBackpackSatchelMimeFilled duffelbag: ClothingBackpackDuffelMimeFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite - type: entity id: ActionMimeInvisibleWall diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index 28f9c597e5..f01b5af4cb 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -29,3 +29,7 @@ ears: ClothingHeadsetService satchel: ClothingBackpackSatchelMusicianFilled duffelbag: ClothingBackpackDuffelMusicianFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index 8bfd05ad01..43c527b99a 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -30,3 +30,7 @@ innerClothingSkirt: ClothingUniformJumpskirtColorDarkGreen # DeltaV satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 219684cc7d..0f76e76c2f 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -56,3 +56,7 @@ innerClothingSkirt: ClothingUniformJumpskirtCaptain satchel: ClothingBackpackSatchelCaptainFilled duffelbag: ClothingBackpackDuffelCaptainFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml index 37c73f38e0..74d01467f5 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml @@ -27,3 +27,7 @@ belt: WeaponPistolN1984 pocket1: BoxFolderBlack pocket2: PenCentcom + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 878b184b8b..19495de46c 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -81,3 +81,7 @@ innerClothingSkirt: ClothingUniformJumpskirtHoP satchel: ClothingBackpackSatchelHOPFilled duffelbag: ClothingBackpackDuffelHOPFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index 834a85e7a0..c8d6d447c8 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -30,3 +30,7 @@ innerClothingSkirt: ClothingUniformJumpskirtAtmos satchel: ClothingBackpackSatchelAtmosphericsFilled duffelbag: ClothingBackpackDuffelAtmosphericsFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 2690b9ba01..155d7dea9a 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -49,3 +49,7 @@ innerClothingSkirt: ClothingUniformJumpskirtChiefEngineer satchel: ClothingBackpackSatchelChiefEngineerFilled duffelbag: ClothingBackpackDuffelChiefEngineerFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml index 5106f1129c..5176586389 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml @@ -37,3 +37,7 @@ innerClothingSkirt: ClothingUniformJumpskirtSeniorEngineer satchel: ClothingBackpackSatchelEngineeringFilled duffelbag: ClothingBackpackDuffelEngineeringFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index dc59004519..de5f31fdbf 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -31,3 +31,7 @@ innerClothingSkirt: ClothingUniformJumpskirtEngineering satchel: ClothingBackpackSatchelEngineeringFilled duffelbag: ClothingBackpackDuffelEngineeringFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index b0a87f6b85..be68fca8bf 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -33,3 +33,7 @@ innerClothingSkirt: ClothingUniformJumpskirtColorYellow satchel: ClothingBackpackSatchelEngineeringFilled duffelbag: ClothingBackpackDuffelEngineeringFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 66466352cb..b16d01447e 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -32,3 +32,7 @@ innerClothingSkirt: ClothingUniformJumpskirtChemistry satchel: ClothingBackpackSatchelChemistryFilled duffelbag: ClothingBackpackDuffelChemistryFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index b132729432..dbd1ef5195 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -56,3 +56,7 @@ innerClothingSkirt: ClothingUniformJumpskirtCMO satchel: ClothingBackpackSatchelCMOFilled duffelbag: ClothingBackpackDuffelCMOFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index 627b0e17dc..210fdc40a1 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -33,3 +33,7 @@ innerClothingSkirt: ClothingUniformJumpskirtMedicalDoctor satchel: ClothingBackpackSatchelMedicalFilled duffelbag: ClothingBackpackDuffelMedicalFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 0aa92ad378..c2ce636e01 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -35,3 +35,7 @@ # innerClothingSkirt: ClothingUniformJumpskirtColorWhite # DeltaV satchel: ClothingBackpackSatchelMedicalFilled duffelbag: ClothingBackpackDuffelMedicalFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 0937a4627a..4cd63ad554 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -42,3 +42,7 @@ innerClothingSkirt: ClothingUniformJumpskirtParamedic satchel: ClothingBackpackSatchelParamedicFilledDV # DeltaV - Give Paramedics useful tools on spawn, see Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StargerGear/satchel.yml duffelbag: ClothingBackpackDuffelParamedicFilledDV # DeltaV - Give Paramedics useful tools on spawn, see Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StargerGear/duffelbag.yml + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml index d13fd18afd..4a408028d1 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml @@ -40,3 +40,7 @@ innerClothingSkirt: ClothingUniformJumpskirtSeniorPhysician satchel: ClothingBackpackSatchelMedicalFilled duffelbag: ClothingBackpackDuffelMedicalFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index 2d86b3bf97..ba2b671a60 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -30,3 +30,7 @@ innerClothingSkirt: ClothingUniformJumpskirtColorWhite satchel: ClothingBackpackSatchelScienceFilled duffelbag: ClothingBackpackDuffelScienceFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 9d2cba83c2..e7cbdcbb53 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -51,3 +51,7 @@ innerClothingSkirt: ClothingUniformJumpskirtResearchDirector satchel: ClothingBackpackSatchelResearchDirectorFilled duffelbag: ClothingBackpackDuffelResearchDirectorFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index 2d91e0e6ef..108c2ea311 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -26,3 +26,7 @@ innerClothingSkirt: ClothingUniformJumpskirtScientist satchel: ClothingBackpackSatchelScienceFilled duffelbag: ClothingBackpackDuffelScienceFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml index 74a30d6a88..ea9ba5d4f3 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml @@ -29,3 +29,7 @@ innerClothingSkirt: ClothingUniformJumpskirtSeniorResearcher satchel: ClothingBackpackSatchelScienceFilled duffelbag: ClothingBackpackDuffelScienceFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 861088b5e5..ab777ac8c3 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -38,3 +38,7 @@ innerClothingSkirt: ClothingUniformJumpskirtDetective satchel: ClothingBackpackSatchelSecurityFilledDetective duffelbag: ClothingBackpackDuffelSecurityFilledDetective + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index f157853455..c2d2eca28b 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -56,3 +56,7 @@ innerClothingSkirt: ClothingUniformJumpskirtHoS satchel: ClothingBackpackSatchelHOSFilled duffelbag: ClothingBackpackDuffelHOSFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 5775576404..0f8db7f157 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -40,3 +40,7 @@ innerClothingSkirt: ClothingUniformJumpskirtColorRed satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 930c9a58a3..7da9e42c10 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -37,3 +37,7 @@ innerClothingSkirt: ClothingUniformJumpskirtSec satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml index 2623adf1fd..9e12c49d9a 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -47,3 +47,7 @@ innerClothingSkirt: ClothingUniformJumpskirtSeniorOfficer satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 82101373db..05c6e241f6 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -44,3 +44,7 @@ innerClothingSkirt: ClothingUniformJumpskirtWarden satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml index 33def38bb0..37c3995405 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml @@ -36,3 +36,7 @@ innerClothingSkirt: UniformShortsRedWithTop satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index a2974c6eb7..697c18ec5c 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -30,3 +30,7 @@ innerClothingSkirt: ClothingUniformJumpsuitPsychologist satchel: ClothingBackpackSatchelPsychologistFilled #DeltaV - stamp included duffelbag: ClothingBackpackDuffelPsychologistFilled #DeltaV - stamp included + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml index ad810e970e..b9d1a799a1 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -26,3 +26,7 @@ innerClothingSkirt: ClothingUniformJumpsuitJournalist satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml index 1686e3290f..a4ebfa45df 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml @@ -26,3 +26,7 @@ innerClothingSkirt: ClothingUniformJumpsuitSafari satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml index 5262c47da3..e39c488805 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml @@ -17,7 +17,7 @@ - type: entity parent: ClothingMaskBase id: LPPClothingMaskShemagGreen - categories: [ HideSpawnMenu ] + noSpawn: true name: зелёный шемаг components: - type: Sprite @@ -44,7 +44,7 @@ - type: entity parent: ClothingMaskBase id: LPPClothingMaskShemagRed - categories: [ HideSpawnMenu ] + noSpawn: true name: красный шемаг components: - type: Sprite @@ -71,7 +71,7 @@ - type: entity parent: ClothingMaskBase id: LPPClothingMaskShemagBlue - categories: [ HideSpawnMenu ] + noSpawn: true name: синий шемаг components: - type: Sprite @@ -98,7 +98,7 @@ - type: entity parent: ClothingMaskBase id: LPPClothingMaskShemagBrown - categories: [ HideSpawnMenu ] + noSpawn: true name: коричневый шемаг components: - type: Sprite @@ -125,7 +125,7 @@ - type: entity parent: ClothingMaskBase id: LPPClothingMaskShemagPurple - categories: [ HideSpawnMenu ] + noSpawn: true name: фиолетовый шемаг components: - type: Sprite diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/Lazerdefhard.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/Lazerdefhard.yml index 5a7a13e767..ab389b005d 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/Lazerdefhard.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/Lazerdefhard.yml @@ -55,3 +55,5 @@ reflectProb: 1 reflects: - Energy + - type: StaminaDamageResistance + coefficient: 0.7 diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/NPZ.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/NPZ.yml index 6017f8d695..5ad14658cb 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/NPZ.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/NPZ.yml @@ -36,13 +36,15 @@ clothingPrototype: LPPClothingOuterHardsuitHelmetLeaderNFSD - type: StaticPrice price: 350 + - type: StaminaDamageResistance + coefficient: 0.3 - type: entity parent: ClothingHeadHardsuitWithLightBase id: LPPClothingOuterHardsuitHelmetLeaderNFSD name: шлем элитного скафандра шерифа description: Пархай как бабочка, жаль, что ты уже мёртв, жалкий ксенос! - categories: [ HideSpawnMenu ] + noSpawn: true components: - type: BreathMask - type: Sprite @@ -82,6 +84,8 @@ Heat: 0.9 - type: ExplosionResistance damageCoefficient: 0.8 + - type: StaminaDamageResistance + coefficient: 0.8 - type: entity parent: ClothingOuterHardsuitBase @@ -117,13 +121,15 @@ clothingPrototype: LPPClothingOuterHardsuitHelmetNPZ - type: StaticPrice price: 350 + - type: StaminaDamageResistance + coefficient: 0.7 - type: entity parent: ClothingHeadHardsuitWithLightBase id: LPPClothingOuterHardsuitHelmetNPZ name: шлем скафандра НПЗ description: Пархай как бабочка, жаль, что ты уже мёртв, жалкий ксенос! - categories: [ HideSpawnMenu ] + noSpawn: true components: - type: BreathMask - type: Sprite @@ -182,13 +188,15 @@ clothingPrototype: LPPClothingOuterHardsuitHelmetSpecopsNPZ - type: StaticPrice price: 350 + - type: StaminaDamageResistance + coefficient: 0.55 - type: entity parent: ClothingHeadHardsuitWithLightBase id: LPPClothingOuterHardsuitHelmetSpecopsNPZ name: шлем спецподразделения НПЗ description: Пархай как бабочка, жаль, что ты уже мёртв, жалкий ксенос! - categories: [ HideSpawnMenu ] + noSpawn: true components: - type: BreathMask - type: Sprite diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/acienthardsuitsyndie.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/acienthardsuitsyndie.yml index bfdb6d5af1..bb5299cc00 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/acienthardsuitsyndie.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/acienthardsuitsyndie.yml @@ -33,3 +33,5 @@ requiredSlot: - outerclothing slot: mask + - type: StaminaDamageResistance + coefficient: 0.4 \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/detectivehardsuit.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/detectivehardsuit.yml index 9d5bd94448..31cf818040 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/detectivehardsuit.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/detectivehardsuit.yml @@ -31,6 +31,8 @@ clothingPrototype: LPPClothingHeadHelmetDetectiveHardsuit - type: StaticPrice price: 350 + - type: StaminaDamageResistance + coefficient: 0.7 - type: entity parent: ClothingHeadHardsuitWithLightBase diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml index 53a2849012..2be7042448 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml @@ -26,6 +26,8 @@ Radiation: 0.10 - type: ToggleableClothing clothingPrototype: LPPArmorMovementHead + - type: StaminaDamageResistance + coefficient: 0.7 - type: entity parent: ClothingOuterHardsuitBase @@ -60,6 +62,8 @@ damageCoefficient: 0.2 - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitIIC + - type: StaminaDamageResistance + coefficient: 0.3 - type: entity parent: ClothingOuterHardsuitBase @@ -90,6 +94,8 @@ damageCoefficient: 0.2 - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitNightGuard + - type: StaminaDamageResistance + coefficient: 0.3 - type: entity parent: ClothingOuterHardsuitBase @@ -120,6 +126,8 @@ damageCoefficient: 0.4 - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitSWAT + - type: StaminaDamageResistance + coefficient: 0.3 - type: entity parent: ClothingOuterHardsuitBase @@ -146,6 +154,8 @@ damageCoefficient: 0.95 - type: ToggleableClothing clothingPrototype: LPPHardsuitHelmetAssaultParamedic + - type: StaminaDamageResistance + coefficient: 0.95 - type: entity parent: ClothingOuterHardsuitBase @@ -185,6 +195,8 @@ - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitLoneMercenary - type: BiocodedClothing + - type: StaminaDamageResistance + coefficient: 0.5 - type: entity parent: ClothingOuterHardsuitBase @@ -213,6 +225,8 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitSecurityPilot + - type: StaminaDamageResistance + coefficient: 0.7 - type: entity parent: ClothingOuterHardsuitBase @@ -243,6 +257,8 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSecurity + - type: StaminaDamageResistance + coefficient: 0.7 - type: entity parent: ClothingOuterHardsuitBase @@ -272,6 +288,8 @@ damageCoefficient: 0.4 - type: ToggleableClothing clothingPrototype: LPPHardsuitHelmetSuppressor + - type: StaminaDamageResistance + coefficient: 0.2 - type: entity parent: ClothingOuterHardsuitBase @@ -305,6 +323,8 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetMikhelm + - type: StaminaDamageResistance + coefficient: 0.8 - type: entity parent: ClothingOuterHardsuitBase @@ -335,6 +355,8 @@ damageCoefficient: 0.2 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitChrono + - type: StaminaDamageResistance + coefficient: 0.05 - type: entity parent: ClothingOuterHardsuitBase @@ -364,6 +386,8 @@ - type: ClothingSpeedModifier walkModifier: 0.85 sprintModifier: 0.85 + - type: StaminaDamageResistance + coefficient: 0.65 - type: entity parent: ClothingOuterHardsuitBase @@ -399,6 +423,8 @@ - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitIICPyrotech - type: BiocodedClothing + - type: StaminaDamageResistance + coefficient: 0.3 - type: entity parent: ClothingOuterHardsuitBase @@ -434,6 +460,8 @@ - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitIICMedic - type: BiocodedClothing + - type: StaminaDamageResistance + coefficient: 0.3 - type: entity parent: ClothingOuterHardsuitBase @@ -469,6 +497,8 @@ - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitIICCommand - type: BiocodedClothing + - type: StaminaDamageResistance + coefficient: 0.3 - type: entity parent: ClothingOuterHardsuitBase @@ -504,6 +534,8 @@ - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitIICEngineer - type: BiocodedClothing + - type: StaminaDamageResistance + coefficient: 0.3 - type: entity parent: ClothingOuterHardsuitBase diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/merchardsuit.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/merchardsuit.yml index 72e81d76c1..168a42df5d 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/merchardsuit.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/merchardsuit.yml @@ -28,6 +28,8 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitMerc + - type: StaminaDamageResistance + coefficient: 0.5 - type: entity parent: ClothingHeadHardsuitWithLightBase diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/miksuitjugger.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/miksuitjugger.yml index 1bb4f42a49..5adaf51311 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/miksuitjugger.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/miksuitjugger.yml @@ -24,13 +24,14 @@ Heat: 0.40 Radiation: 0.2 Caustic: 0.2 - Stamina: 0.65 - type: ClothingSpeedModifier walkModifier: 0.7 sprintModifier: 0.6 # - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetMikhelmJugger + - type: StaminaDamageResistance + coefficient: 0.4 - type: entity parent: ClothingHeadHardsuitWithLightBase diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/jumpsuitsnpz.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/jumpsuitsnpz.yml index 4a57754eb2..55b39967e4 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/jumpsuitsnpz.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/jumpsuitsnpz.yml @@ -32,12 +32,13 @@ parent: ClothingUniformBase id: LPPClothingUniformJumpsuitOverallsNPZ name: комбинезон техника НПЗ - description: Свитер и брюки на лямках с небольшими кармашками для ваших инструментов, не испачкайте рубашку! + description: Свитер и брюки на лямках, не испачкайте рубашку! components: - type: Sprite sprite: _LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi - type: Clothing sprite: _LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi - - type: Storage - grid: - - 0,0,1,2 \ No newline at end of file + - type: Armor + modifiers: + coefficients: + Heat: 0.9 \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/blueshieldoficer.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/blueshieldoficer.yml index 31f7e3378c..ee04997e1b 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/blueshieldoficer.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/blueshieldoficer.yml @@ -39,6 +39,10 @@ ears: ClothingHeadsetAltCommand pocket1: LPPBlueshieldlaser pocket2: HandheldCrewMonitor + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite storage: back: - Flash diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml index 234f66001f..7aca9c77bd 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml @@ -47,3 +47,7 @@ equipment: id: LPPAdjutantPDA ears: ClothingHeadsetCommand + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/expeditor.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/expeditor.yml index 9b7e9c713f..a6f5be8d23 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/expeditor.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/expeditor.yml @@ -29,3 +29,7 @@ id: LPPExpeditorPDA ears: ClothingHeadsetScience hands: ClothingHandsGlovesCombat + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/roboticist.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/roboticist.yml index aff4f4551c..3b00142732 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/roboticist.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/roboticist.yml @@ -23,3 +23,7 @@ ears: ClothingHeadsetRobotics eyes: ClothingEyesHudDiagnostic belt: ClothingBeltUtilityEngineering + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml index 4c2aeedc71..b24e610c0c 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml @@ -35,6 +35,10 @@ outerClothing: ClothingOuterVestHazard ears: LPPClothingHeadsetSecurityEngineer belt: LPPClothingMilitaryWebbingSecEng + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite storage: back: - SheetSteel10 diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/secupilot.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/secupilot.yml index 3d49c92460..2fd94460e2 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/secupilot.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/secupilot.yml @@ -34,3 +34,7 @@ id: SecPilotPDA ears: ClothingHeadsetSecurity pocket1: WeaponPistolMk58 + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + underwear: LPPBriefs + breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..33dcf1b75b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..e62fa89ab5 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING.png index c2d3934cbb..adfdc99fbe 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/icon.png index 3e9c24edaf..cd1bcd2e14 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-left.png index e5e277dbcc..0362284288 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-right.png index 0e0e6230ac..65eb36b9b4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json index e482264df5..ca1146d007 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.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/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..e08fcd7229 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..0a224c92b9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING.png index 5ffa578618..0867d9794a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/icon.png index cfdd191825..c439c7ab23 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-left.png index 6e98089bd4..51abed1325 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-right.png index 470def2a41..0aaa364525 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json index e482264df5..232bec9c0a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/general.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/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..480e65bcf0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..82b0ea9f36 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING.png index acb3d355f2..fdc219ce20 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/icon.png index 71a603615b..1b9e8be421 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-left.png index 6920ec8f74..6011316bd2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-right.png index e3d2c93b6c..f5743b6a55 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json index e482264df5..ca1146d007 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.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/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..a75abc22ea Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..044d87e2f6 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING.png index a7d80f02b4..c9481ce8c3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/icon.png index 4b16a3255c..8e9483e783 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-left.png index dced6667b0..b702994435 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-right.png index b69b0bbd20..33d4b9a599 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json index e482264df5..ca1146d007 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.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/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..ce03591b44 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..e426556e7d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png index a779b3812d..67a4f30ea5 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png index eea15cfb0a..5522eb9de4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png index 36bd1257f2..d1164c39ab 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png index 89de6e8fc6..22bf56e0b7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json index e482264df5..dd06151574 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/security.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/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/blob/061f78db763863e1a3db13cbf2fd9be4cce75939/icons/mob/suit.dmi. inhands by Flareguy, modified from bio_suit in vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/30f9caeb59b0dd9da1dbcd4c69307ae182033a74", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..d9ab22b435 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..f6b5c43d2b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING.png index e1e81a8409..6fae8df90d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/icon.png index 52bc430c98..ad0a604d21 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-left.png index c91403c123..b6815a0e79 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-right.png index b2a41d23cc..644533b009 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json index e482264df5..ca1146d007 100644 --- a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Bio/virology.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/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..2fc3e13a20 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png index 24481b1f74..a53a7049f1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png index ed3481d3d2..67749bd79d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png index 9f79738900..6ae85c89b5 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png index b1315700d1..c9dfddebd9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json index 18a65e16d7..b2c9c73012 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC0-1.0", - "copyright": "Created by EmoGarbage404", + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy. Vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob//icons/mob/species/vox/suit.dmi and modified by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..e89ec20485 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png index 987679cecb..c45743726c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png index 20ac8b6d18..3b4410b9a5 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png index aa0228cf31..52b9733ec1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png index 4d6c934790..83e924a710 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json index 55e082d620..afc5942298 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.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/4f6190e2895e09116663ef282d3ce1d8b35c032e , edited by Alekshhh", + "copyright": "Taken from Paradise at commit bad1ec7aa2c86df5794dc6ba28be05ebd0228012", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..56983936f4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png index b62a0318da..8760a37e84 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png index b226550a5d..5f18b94c80 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png index 51b08d9568..b4cd26fd59 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png index 464ee509bc..9d7d68d0ab 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json index e482264df5..cb3e0ab471 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/warden.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/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and modified by Flareguy. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and modified by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/equipped-OUTERCLOTHING.png index 24049801ed..5c327f8181 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/icon.png index 45411502de..17cf51eb27 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/inhand-left.png index c70606e1ef..456256eea3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/inhand-right.png index 5b4ad26425..7eda332134 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/meta.json index 3a71879aff..d86b4ff14c 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/fb2d71495bfe81446159ef528534193d09dd8d34", + "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/blob/e0d164017ae7eb3fee9c538cdb5baa9eb4bf1b87/modular_skyrat/master_files/icons/mob/clothing/suits/spacesuit.dmi, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -12,33 +12,11 @@ }, { "name": "equipped-OUTERCLOTHING", - "directions": 4, - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 }, { "name": "inhand-left", diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING.png index 446f160a54..47c35d443e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/icon.png index 8e6e1c37a5..d6d055b54f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png index 28f0ec6bd1..97f06bdea2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/icon.png index 17f29de4c9..66b0e591a7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-left.png index aa750ee200..ad84316953 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-right.png index 526891c823..30468f6ee3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json index 0a8c670a89..232bec9c0a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/fire.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/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy edit by VMSolidus", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -15,8 +15,8 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 }, { "name": "inhand-left",