From: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Date: Thu, 9 May 2024 21:53:55 +0000 (-0400) Subject: CMO Drip DLC (#26153) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=77ee0088f9bd2ac8ff09e4b4ee2777bb7f2bea05;p=space-station-14.git CMO Drip DLC (#26153) * All the stuff yes yes * THE GOD DAMN META bruh * New sprites and all that jazz yay * loadouts working? --- diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index 81d975e06a..036448b00c 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -39,7 +39,10 @@ - id: ClothingNeckMantleCMO - id: ClothingCloakCmo - id: ClothingOuterCoatLabCmo + - id: ClothingUniformJumpsuitCMOTurtle + - id: ClothingUniformJumpskirtCMOTurtle - id: ClothingHeadHatBeretCmo + - id: ClothingHeadMirror - id: ClothingEyesGlasses - id: ClothingOuterWinterCMO diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml index a20a8ac67d..22009e7561 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml @@ -45,6 +45,8 @@ contents: - id: HandheldHealthAnalyzer prob: 0.6 + - id: ClothingHeadMirror + prob: 0.1 - id: ClothingHandsGlovesLatex - id: ClothingHeadsetMedical - id: ClothingEyesHudMedical diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index c7ba6e0b32..c6a556b2d3 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -86,6 +86,17 @@ - type: Clothing sprite: Clothing/Head/Misc/pwig.rsi +- type: entity + parent: ClothingHeadBase + id: ClothingHeadMirror + name: head mirror + description: I doubt even the CMO knows how to use this thing. + components: + - type: Sprite + sprite: Clothing/Head/Misc/head_mirror.rsi + - type: Clothing + sprite: Clothing/Head/Misc/head_mirror.rsi + - type: entity parent: ClothingHeadBase id: ClothingHeadHatRichard diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 998d462898..ea7b4ea0aa 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -119,6 +119,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/cmo.rsi +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtCMOTurtle + name: chief medical officer's turtleneck jumpskirt + description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi + - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtDetective diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 0151784b66..a713530515 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -264,6 +264,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/cmo.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCMOTurtle + name: chief medical officer's turtleneck jumpsuit + description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitDetective diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index f29e5f155a..8305fc5a90 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -970,6 +970,8 @@ - ClothingHeadHatBeretCmo - ClothingUniformJumpsuitCMO - ClothingUniformJumpskirtCMO + - ClothingUniformJumpsuitCMOTurtle + - ClothingUniformJumpskirtCMOTurtle - ClothingUniformJumpsuitDetective - ClothingUniformJumpskirtDetective - ClothingUniformJumpsuitEngineering diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml index 4a0c011f43..8cf8148518 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml @@ -17,6 +17,24 @@ equipment: jumpsuit: ClothingUniformJumpskirtCMO +- type: loadout + id: ChiefMedicalOfficerTurtleneckJumpsuit + equipment: ChiefMedicalOfficerTurtleneckJumpsuit + +- type: startingGear + id: ChiefMedicalOfficerTurtleneckJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitCMOTurtle + +- type: loadout + id: ChiefMedicalOfficerTurtleneckJumpskirt + equipment: ChiefMedicalOfficerTurtleneckJumpskirt + +- type: startingGear + id: ChiefMedicalOfficerTurtleneckJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtCMOTurtle + # Head - type: loadout id: ChiefMedicalOfficerBeret @@ -27,6 +45,15 @@ equipment: head: ClothingHeadHatBeretCmo +- type: loadout + id: CMOMedicalHeadMirror + equipment: CMOMedicalHeadMirror + +- type: startingGear + id: CMOMedicalHeadMirror + equipment: + head: ClothingHeadMirror + # Neck - type: loadout id: ChiefMedicalOfficerCloak diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml index 7e4732cd03..ebad9b9f84 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml @@ -18,6 +18,17 @@ department: Medical time: 216000 # 60 hrs +# Other Timers + +- type: loadoutEffectGroup + id: MedicalHeadMirrorTimer + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobMedicalDoctor + time: 108000 #30 hrs + # Head - type: loadout @@ -32,6 +43,18 @@ equipment: head: ClothingHeadHatBeretSeniorPhysician +- type: loadout + id: MedicalHeadMirror + equipment: MedicalHeadMirror + effects: + - !type:GroupLoadoutEffect + proto: MedicalHeadMirrorTimer + +- type: startingGear + id: MedicalHeadMirror + equipment: + head: ClothingHeadMirror + - type: loadout id: MedicalBeret equipment: MedicalBeret diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index c6a1d3a822..d889514a33 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -25,7 +25,7 @@ - ClothingNeckTransPin - ClothingNeckAutismPin - ClothingNeckGoldAutismPin - + - type: loadoutGroup id: Glasses name: loadout-group-glasses @@ -34,7 +34,7 @@ - Glasses - GlassesJamjar - GlassesJensen - + # Command - type: loadoutGroup id: CaptainHead @@ -994,6 +994,7 @@ minLimit: 0 loadouts: - ChiefMedicalOfficerBeret + - CMOMedicalHeadMirror - type: loadoutGroup id: ChiefMedicalOfficerJumpsuit @@ -1001,6 +1002,8 @@ loadouts: - ChiefMedicalOfficerJumpsuit - ChiefMedicalOfficerJumpskirt + - ChiefMedicalOfficerTurtleneckJumpsuit + - ChiefMedicalOfficerTurtleneckJumpskirt - type: loadoutGroup id: ChiefMedicalOfficerOuterClothing @@ -1040,6 +1043,7 @@ loadouts: - MedicalBeret - SeniorPhysicianBeret + - MedicalHeadMirror - BlueSurgeryCap - GreenSurgeryCap - PurpleSurgeryCap diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 729f20e979..98cb1a3d51 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -217,6 +217,22 @@ Cloth: 300 Durathread: 100 +- type: latheRecipe + id: ClothingUniformJumpsuitCMOTurtle + result: ClothingUniformJumpsuitCMOTurtle + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 + +- type: latheRecipe + id: ClothingUniformJumpskirtCMOTurtle + result: ClothingUniformJumpskirtCMOTurtle + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 + - type: latheRecipe id: ClothingUniformJumpsuitDetective result: ClothingUniformJumpsuitDetective diff --git a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..f0422f7aba Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/icon.png new file mode 100644 index 0000000000..f382faa420 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-left.png new file mode 100644 index 0000000000..f4cd0d9464 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-right.png new file mode 100644 index 0000000000..ab53a413c6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/meta.json new file mode 100644 index 0000000000..5a9100512c --- /dev/null +++ b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Hanzdegloker", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..a2581dab5e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..b4d2825f0d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/icon.png new file mode 100644 index 0000000000..b5702f2d31 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-left.png new file mode 100644 index 0000000000..921ca6fbe4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-right.png new file mode 100644 index 0000000000..ed69a45738 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/meta.json new file mode 100644 index 0000000000..a81e5b9477 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi and modified by Hanzdegloekr (github) for space station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..2cc39c8894 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..8e1557db21 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png new file mode 100644 index 0000000000..334ef02242 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-left.png new file mode 100644 index 0000000000..ad7541ea1d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-right.png new file mode 100644 index 0000000000..c0133d22a2 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/meta.json new file mode 100644 index 0000000000..58b759095d --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi and modified by Hanzdegloker (github) for space station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}