Gives mining medic an unupgradeable version of the explorer suit (#21961)

* makes the suit

* Update explorer_gear.dm

* new sprites

* Update explorer_gear.dm

* Update explorer_gear.dm

* Update explorer_gear.dm
This commit is contained in:
Molti
2024-05-20 01:06:43 -05:00
committed by GitHub
parent 540da34375
commit 433c449275
14 changed files with 153 additions and 53 deletions

View File

@@ -176,9 +176,7 @@ GLOBAL_LIST_INIT(detective_vest_allowed, typecacheof(list(
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
/obj/item/storage/fancy/cigarettes,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/plasmaman,
/obj/item/tank/internals/ipc_coolant)))
/obj/item/tank/internals)))
GLOBAL_LIST_INIT(security_vest_allowed, typecacheof(list(
/obj/item/ammo_box,
@@ -191,9 +189,7 @@ GLOBAL_LIST_INIT(security_vest_allowed, typecacheof(list(
/obj/item/melee/classic_baton,
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/plasmaman,
/obj/item/tank/internals/ipc_coolant)))
/obj/item/tank/internals)))
GLOBAL_LIST_INIT(security_wintercoat_allowed, typecacheof(list(
/obj/item/ammo_box,
@@ -207,7 +203,37 @@ GLOBAL_LIST_INIT(security_wintercoat_allowed, typecacheof(list(
/obj/item/melee/classic_baton,
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/plasmaman,
/obj/item/tank/internals/ipc_coolant,
/obj/item/tank/internals,
/obj/item/toy)))
GLOBAL_LIST_INIT(labcoat_allowed, typecacheof(list(
/obj/item/analyzer,
/obj/item/multitool/tricorder,
/obj/item/stack/medical,
/obj/item/dnainjector,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/autoinjector,
/obj/item/healthanalyzer,
/obj/item/reagent_containers/glass/bottle,
/obj/item/reagent_containers/glass/beaker,
/obj/item/reagent_containers/pill,
/obj/item/storage/pill_bottle,
/obj/item/paper,
/obj/item/melee/classic_baton/telescopic,
/obj/item/soap,
/obj/item/sensor_device,
/obj/item/tank/internals,
/obj/item/hypospray,
/obj/item/flashlight)))
GLOBAL_LIST_INIT(mining_allowed, typecacheof(list(
/obj/item/flashlight,
/obj/item/tank/internals,
/obj/item/resonator,
/obj/item/mining_scanner,
/obj/item/t_scanner/adv_mining_scanner,
/obj/item/gun/energy/kinetic_accelerator,
/obj/item/pickaxe,
/obj/item/organ/regenerative_core/legion,
/obj/item/kitchen/knife/combat)))

View File

@@ -119,22 +119,8 @@
icon_state = "medic"
/obj/structure/closet/secure_closet/mmedical/PopulateContents()
..()
if(prob(50))
new /obj/item/storage/backpack/medic(src)
else
new /obj/item/storage/backpack/satchel/med(src)
new /obj/item/storage/backpack/duffelbag/clothing/med/miner(src)
new /obj/item/defibrillator/loaded(src)
new /obj/item/clothing/suit/toggle/labcoat/emt/explorer(src)
new /obj/item/clothing/head/beret/emt/mining(src)
new /obj/item/clothing/under/yogs/rank/miner/medic(src)
new /obj/item/clothing/suit/toggle/labcoat/explorer(src)
new /obj/item/storage/belt/medical/mining(src)
new /obj/item/clothing/glasses/hud/health/meson(src)
new /obj/item/clothing/gloves/color/latex/fireproof(src)
new /obj/item/clothing/shoes/sneakers/white(src)
new /obj/item/radio/headset/headset_medcargo(src)
new /obj/item/clothing/mask/gas/explorer(src)
new /obj/item/binoculars(src)
new /obj/item/pinpointer/crew(src)
new /obj/item/sensor_device(src)

View File

@@ -445,21 +445,27 @@
jobtype = /datum/job/miningmedic
head = /obj/item/clothing/head/helmet/space/plasmaman/blue
r_hand= /obj/item/tank/internals/plasmaman/belt/full
mask = /obj/item/clothing/mask/breath
backpack_contents = list(/obj/item/roller = 1,\
/obj/item/kitchen/knife/combat/survival = 1,\
/obj/item/reagent_containers/autoinjector/medipen/survival = 1,\
/obj/item/modular_computer/laptop/preset/paramedic/mining_medic = 1)
belt = /obj/item/storage/belt/medical/mining
/obj/item/modular_computer/laptop/preset/paramedic/mining_medic = 1,\
/obj/item/storage/firstaid/hypospray/qmc = 1)
ears = /obj/item/radio/headset/headset_medcargo
glasses = /obj/item/clothing/glasses/hud/health/meson
shoes = /obj/item/clothing/shoes/workboots/mining
mask = /obj/item/clothing/mask/breath
head = /obj/item/clothing/head/helmet/space/plasmaman/blue
suit = /obj/item/clothing/suit/hooded/miningmedic
uniform = /obj/item/clothing/under/plasmaman/mining
l_hand = /obj/item/storage/firstaid/hypospray/qmc
l_pocket = /obj/item/wormhole_jaunter
belt = /obj/item/storage/belt/medical/mining
gloves = /obj/item/clothing/gloves/color/latex/fireproof
r_hand= /obj/item/tank/internals/plasmaman/belt/full
l_pocket = /obj/item/wormhole_jaunter
shoes = /obj/item/clothing/shoes/workboots/mining
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel/med
duffelbag = /obj/item/storage/backpack/duffelbag/med

View File

@@ -5,11 +5,14 @@
item_state = "labcoat"
blood_overlay_type = "coat"
body_parts_covered = CHEST|ARMS
allowed = list(/obj/item/analyzer, /obj/item/multitool/tricorder, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/autoinjector, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/tank/internals/ipc_coolant, /obj/item/hypospray)
armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 50, RAD = 0, FIRE = 50, ACID = 50)
togglename = "buttons"
species_exception = list(/datum/species/golem)
/obj/item/clothing/suit/toggle/labcoat/Initialize(mapload)
. = ..()
allowed |= GLOB.labcoat_allowed
/obj/item/clothing/suit/toggle/labcoat/cmo
name = "chief medical officer's labcoat"
desc = "Bluer than the standard model."
@@ -27,7 +30,6 @@
desc = "A dark blue jacket with reflective strips for emergency medical technicians."
icon_state = "labcoat_emt"
item_state = "labcoat_cmo"
allowed = list(/obj/item/analyzer, /obj/item/multitool/tricorder, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/autoinjector, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/tank/internals/ipc_coolant, /obj/item/hypospray, /obj/item/flashlight)
/obj/item/clothing/suit/toggle/labcoat/emt/green
name = "\improper green EMT's jacket"

View File

@@ -13,7 +13,6 @@
flags_prot = HIDEJUMPSUIT
hoodtype = /obj/item/clothing/head/hooded/explorer
armor = list(MELEE = 25, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 50, BIO = 100, RAD = 50, FIRE = 50, ACID = 50, WOUND = 10)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife/combat)
resistance_flags = FIRE_PROOF
mutantrace_variation = DIGITIGRADE_VARIATION
@@ -30,6 +29,15 @@
resistance_flags = FIRE_PROOF
var/adjusted = NORMAL_STYLE
/obj/item/clothing/suit/hooded/explorer/Initialize(mapload)
. = ..()
AddComponent(/datum/component/armor_plate)
allowed |= GLOB.mining_allowed
/obj/item/clothing/head/hooded/explorer/Initialize(mapload)
. = ..()
AddComponent(/datum/component/armor_plate)
/obj/item/clothing/head/hooded/explorer/verb/hood_adjust()
set name = "Adjust Hood Style"
set category = null
@@ -48,14 +56,6 @@
H.update_hair()
H.update_body()
/obj/item/clothing/suit/hooded/explorer/Initialize(mapload)
. = ..()
AddComponent(/datum/component/armor_plate)
/obj/item/clothing/head/hooded/explorer/Initialize(mapload)
. = ..()
AddComponent(/datum/component/armor_plate)
/obj/item/clothing/mask/gas/explorer
name = "explorer gas mask"
desc = "A military-grade gas mask that can be connected to an air supply."
@@ -90,12 +90,12 @@
resistance_flags = FIRE_PROOF | LAVA_PROOF
slowdown = 0
armor = list(MELEE = 75, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 75, BIO = 100, RAD = 60, FIRE = 100, ACID = 100)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife/combat)
/obj/item/clothing/suit/space/hostile_environment/Initialize(mapload)
. = ..()
AddComponent(/datum/component/spraycan_paintable)
START_PROCESSING(SSobj, src)
allowed |= GLOB.mining_allowed
/obj/item/clothing/suit/space/hostile_environment/Destroy()
STOP_PROCESSING(SSobj, src)

View File

@@ -4303,6 +4303,7 @@
#include "yogstation\code\modules\clothing\shoes\special_shoes.dm"
#include "yogstation\code\modules\clothing\spacesuits\hardsuit.dm"
#include "yogstation\code\modules\clothing\suits\armor.dm"
#include "yogstation\code\modules\clothing\suits\explorer_gear.dm"
#include "yogstation\code\modules\clothing\suits\labcoat.dm"
#include "yogstation\code\modules\clothing\suits\miscellaneous.dm"
#include "yogstation\code\modules\clothing\suits\nerd.dm"

View File

@@ -231,3 +231,22 @@
new /obj/item/clothing/head/beret/med/phys(src)
new /obj/item/clothing/head/beret/corpsec/phys(src)
new /obj/item/clothing/shoes/xeno_wraps/jackboots(src)
/obj/item/storage/backpack/duffelbag/clothing/med/miner
name = "Mining Medic's clothing duffelbag"
desc = "A large duffel bag filled with clothing."
icon_state = "duffel-med"
item_state = "duffel-med"
/obj/item/storage/backpack/duffelbag/clothing/med/miner/PopulateContents()
new /obj/item/clothing/suit/toggle/labcoat/emt/explorer(src)
new /obj/item/clothing/suit/toggle/labcoat/explorer(src)
new /obj/item/clothing/head/soft/emt/mining(src)
new /obj/item/clothing/head/beret/emt/mining(src)
new /obj/item/clothing/under/yogs/rank/miner/medic(src)
new /obj/item/storage/belt/medical/mining(src)
new /obj/item/clothing/glasses/hud/health/meson(src)
new /obj/item/clothing/gloves/color/latex/fireproof(src)
new /obj/item/clothing/shoes/sneakers/white(src)
new /obj/item/radio/headset/headset_medcargo(src)
new /obj/item/clothing/mask/gas/explorer(src)

View File

@@ -0,0 +1,58 @@
/obj/item/clothing/suit/hooded/miningmedic
name = "recovery suit"
desc = "A lightly armoured suit for search and rescue in harsh environments."
icon_state = "recovery"
item_state = "recovery"
worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
body_parts_covered = CHEST|GROIN|LEGS|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
cold_protection = CHEST|GROIN|LEGS|ARMS
max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
heat_protection = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDEGLOVES|HIDESHOES
flags_prot = HIDEJUMPSUIT
hoodtype = /obj/item/clothing/head/hooded/miningmedic
armor = list(MELEE = 40, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 50, BIO = 100, RAD = 50, FIRE = 50, ACID = 50, WOUND = 10)
resistance_flags = FIRE_PROOF
mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/suit/hooded/miningmedic/Initialize(mapload) //can't be reinforced like regular explorer suits, but can also carry medical stuff in addition to mining stuff
. = ..()
allowed |= GLOB.labcoat_allowed
allowed |= GLOB.mining_allowed
/obj/item/clothing/head/hooded/miningmedic
name = "recovery hood"
desc = "A lightly armoured hood for search and rescue in harsh environments."
icon_state = "recovery"
icon = 'yogstation/icons/obj/clothing/hats.dmi'
worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
body_parts_covered = HEAD
flags_inv = HIDEHAIR|HIDEEARS // hoods don't hide your face, silly
flags_prot = HIDEHAIR
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
armor = list(MELEE = 40, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 50, BIO = 100, RAD = 50, FIRE = 50, ACID = 50, WOUND = 10)
resistance_flags = FIRE_PROOF
var/adjusted = NORMAL_STYLE
//don't want this to be a subtype of the explorer suit or it'll inherit the armor plating
/obj/item/clothing/head/hooded/miningmedic/verb/hood_adjust()
set name = "Adjust Hood Style"
set category = null
set src in usr
switch(adjusted)
if(NORMAL_STYLE)
adjusted = ALT_STYLE
to_chat(usr, span_notice("You adjust the hood to wear it more casually."))
flags_inv &= ~HIDEHAIR
if(ALT_STYLE)
adjusted = NORMAL_STYLE
to_chat(usr, span_notice("You adjust the hood back to normal."))
flags_inv |= HIDEHAIR
if(ishuman(usr))
var/mob/living/carbon/human/H = usr
H.update_hair()
H.update_body()

View File

@@ -3,13 +3,11 @@
name = "mining medic's jacket"
desc = "A protective jacket for medical emergencies on off-world planets. Has MM embossed into it."
armor = list(MELEE = 25, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 50, BIO = 100, RAD = 50, FIRE = 50, ACID = 50, WOUND = 10)
allowed = list(/obj/item/analyzer,/obj/item/multitool/tricorder,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/autoinjector,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper,/obj/item/melee/classic_baton/telescopic,/obj/item/soap,/obj/item/sensor_device,/obj/item/tank/internals, /obj/item/hypospray)
/obj/item/clothing/suit/toggle/labcoat/explorer
name = "mining medic's labcoat"
desc = "A protective labcoat for medical emergencies on off-world planets."
armor = list(MELEE = 25, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 50, BIO = 100, RAD = 50, FIRE = 50, ACID = 50, WOUND = 10)
allowed = list(/obj/item/analyzer,/obj/item/multitool/tricorder,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/autoinjector,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper,/obj/item/melee/classic_baton/telescopic,/obj/item/soap,/obj/item/sensor_device,/obj/item/tank/internals, /obj/item/hypospray)
worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon_state = "labcoat_mining"
item_state = "labcoat_mining"

View File

@@ -51,21 +51,25 @@
backpack_contents = list(/obj/item/roller = 1,\
/obj/item/kitchen/knife/combat/survival = 1,\
/obj/item/reagent_containers/autoinjector/medipen/survival = 1,\
/obj/item/modular_computer/laptop/preset/paramedic/mining_medic = 1)
/obj/item/modular_computer/laptop/preset/paramedic/mining_medic = 1,\
/obj/item/storage/firstaid/hypospray/qmc = 1)
belt = /obj/item/storage/belt/medical/mining
ears = /obj/item/radio/headset/headset_medcargo
glasses = /obj/item/clothing/glasses/hud/health/meson
shoes = /obj/item/clothing/shoes/workboots/mining
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/medical
suit = /obj/item/clothing/suit/toggle/labcoat/emt/explorer
suit = /obj/item/clothing/suit/hooded/miningmedic
uniform = /obj/item/clothing/under/yogs/rank/miner/medic
l_hand = /obj/item/storage/firstaid/hypospray/qmc
belt = /obj/item/storage/belt/medical/mining
gloves = /obj/item/clothing/gloves/color/latex/fireproof
l_pocket = /obj/item/wormhole_jaunter
head = /obj/item/clothing/head/soft/emt/mining
shoes = /obj/item/clothing/shoes/workboots/mining
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/medical
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel/med
duffelbag = /obj/item/storage/backpack/duffelbag/med
box = /obj/item/storage/box/survival/mining
pda_slot = ITEM_SLOT_LPOCKET

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 107 KiB

After

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 36 KiB