diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm
index 3b0dcaf67e6..15e610ad333 100644
--- a/code/datums/outfits/outfit_admin.dm
+++ b/code/datums/outfits/outfit_admin.dm
@@ -911,58 +911,57 @@
if(istype(I))
apply_to_card(I, H, get_all_accesses(), "Space Explorer")
-/datum/outfit/admin/hardsuit
- name = "Hardsuit - Generic"
- back = /obj/item/tank/jetpack/oxygen
+/datum/outfit/admin/modsuit
+ name = "MODsuit - Generic"
+ back = /obj/item/mod/control/pre_equipped/standard
+ suit_store = /obj/item/tank/internals/oxygen
mask = /obj/item/clothing/mask/breath
shoes = /obj/item/clothing/shoes/magboots
id = /obj/item/card/id
-/datum/outfit/admin/hardsuit/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/datum/outfit/admin/modsuit/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
- if(istype(H.back, /obj/item/tank/jetpack))
- var/obj/item/tank/jetpack/J = H.back
- J.turn_on()
+ if(istype(H.back, /obj/item/tank/internals/oxygen))
+ var/obj/item/tank/internals/oxygen/J = H.back
J.toggle_internals(H)
var/obj/item/card/id/I = H.wear_id
if(istype(I))
- apply_to_card(I, H, get_all_accesses(), "Hardsuit Tester")
+ apply_to_card(I, H, get_all_accesses(), "MODsuit Tester")
-/datum/outfit/admin/hardsuit/engineer
- name = "Hardsuit - Engineer"
- suit = /obj/item/clothing/suit/space/hardsuit/engine
+/datum/outfit/admin/modsuit/engineer
+ name = "MODsuit - Engineer"
+ back = /obj/item/mod/control/pre_equipped/engineering
-/datum/outfit/admin/hardsuit/ce
- name = "Hardsuit - CE"
- suit = /obj/item/clothing/suit/space/hardsuit/engine/elite
+/datum/outfit/admin/modsuit/ce
+ name = "MODsuit - CE"
+ back = /obj/item/mod/control/pre_equipped/advanced
shoes = /obj/item/clothing/shoes/magboots/advance
-/datum/outfit/admin/hardsuit/mining
- name = "Hardsuit - Mining"
- suit = /obj/item/clothing/suit/space/hardsuit/mining
+/datum/outfit/admin/modsuit/mining
+ name = "MODsuit - Mining"
+ back = /obj/item/mod/control/pre_equipped/mining/asteroid
-/datum/outfit/admin/hardsuit/syndi
- name = "Hardsuit - Syndi"
- suit = /obj/item/clothing/suit/space/hardsuit/syndi
+/datum/outfit/admin/modsuit/syndi
+ name = "MODsuit - Syndi"
+ back = /obj/item/mod/control/pre_equipped/traitor
shoes = /obj/item/clothing/shoes/magboots/syndie
-/datum/outfit/admin/hardsuit/wizard
+/datum/outfit/admin/modsuit/wizard // Technically not a MODsuit, we'll bundle it up in here for the future when it does become one
name = "Hardsuit - Wizard"
suit = /obj/item/clothing/suit/space/hardsuit/shielded/wizard
shoes = /obj/item/clothing/shoes/magboots/wizard
-/datum/outfit/admin/hardsuit/medical
- name = "Hardsuit - Medical"
- suit = /obj/item/clothing/suit/space/hardsuit/medical
-
-/datum/outfit/admin/hardsuit/atmos
- name = "Hardsuit - Atmos"
- suit = /obj/item/clothing/suit/space/hardsuit/engine/atmos
+/datum/outfit/admin/modsuit/medical
+ name = "MODsuit - Medical"
+ back = /obj/item/mod/control/pre_equipped/medical
+/datum/outfit/admin/modsuit/atmos
+ name = "MODsuit - Atmos"
+ back = /obj/item/mod/control/pre_equipped/atmospheric
/datum/outfit/admin/tournament
name = "Tournament Generic"
diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm
index 916a9d157dc..f05ee9cdd53 100644
--- a/code/game/jobs/job/support.dm
+++ b/code/game/jobs/job/support.dm
@@ -127,9 +127,9 @@
var/obj/item/clothing/suit/hooded/S = H.wear_suit
S.ToggleHood()
-/datum/outfit/job/miner/equipped/hardsuit
- name = "Shaft Miner (Equipment + Hardsuit)"
- suit = /obj/item/clothing/suit/space/hardsuit/mining
+/datum/outfit/job/miner/equipped/modsuit
+ name = "Shaft Miner (Equipment + MODsuit)"
+ back = /obj/item/mod/control/pre_equipped/mining/asteroid
mask = /obj/item/clothing/mask/breath
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 480b8a112f6..7a4bfc6a26f 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -213,41 +213,6 @@
/obj/machinery/suit_storage_unit/syndicate/secure
secure = TRUE
-/obj/machinery/suit_storage_unit/ert
- req_access = list(ACCESS_CENT_GENERAL)
-
-/obj/machinery/suit_storage_unit/ert/command
- suit_type = /obj/item/clothing/suit/space/hardsuit/ert/commander
- mask_type = /obj/item/clothing/mask/breath
- storage_type = /obj/item/tank/internals/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/ert/command/secure
- secure = TRUE
-
-/obj/machinery/suit_storage_unit/ert/security
- suit_type = /obj/item/clothing/suit/space/hardsuit/ert/security
- mask_type = /obj/item/clothing/mask/breath
- storage_type = /obj/item/tank/internals/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/ert/security/secure
- secure = TRUE
-
-/obj/machinery/suit_storage_unit/ert/engineer
- suit_type = /obj/item/clothing/suit/space/hardsuit/ert/engineer
- mask_type = /obj/item/clothing/mask/breath
- storage_type = /obj/item/tank/internals/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/ert/engineer/secure
- secure = TRUE
-
-/obj/machinery/suit_storage_unit/ert/medical
- suit_type = /obj/item/clothing/suit/space/hardsuit/ert/medical
- mask_type = /obj/item/clothing/mask/breath
- storage_type = /obj/item/tank/internals/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/ert/medical/secure
- secure = TRUE
-
//telecoms NASA SSU. Suits themselves are assigned in Initialize
/obj/machinery/suit_storage_unit/telecoms
mask_type = /obj/item/clothing/mask/breath
diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm
index f1277d431e8..8fc02767591 100644
--- a/code/game/objects/explosion.dm
+++ b/code/game/objects/explosion.dm
@@ -195,9 +195,6 @@
if(istype(array, /obj/machinery/doppler_array))
var/obj/machinery/doppler_array/Array = array
Array.sense_explosion(x0,y0,z0,devastation_range,heavy_impact_range,light_impact_range,took,orig_dev_range,orig_heavy_range,orig_light_range)
- if(istype(array, /obj/item/clothing/head/helmet/space/hardsuit/rd))
- var/obj/item/clothing/head/helmet/space/hardsuit/rd/Helm_Array = array
- Helm_Array.sense_explosion(x0,y0,z0,devastation_range,heavy_impact_range,light_impact_range,took,orig_dev_range,orig_heavy_range,orig_light_range)
if(istype(array, /obj/item/mod/module/reagent_scanner/advanced))
var/obj/item/mod/module/reagent_scanner/advanced/Mod_Array = array
Mod_Array.sense_explosion(x0,y0,z0,devastation_range,heavy_impact_range,light_impact_range,took,orig_dev_range,orig_heavy_range,orig_light_range)
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 3f61bdeb5bf..34f767302c7 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -187,8 +187,6 @@ GLOBAL_LIST_INIT(sinew_recipes, list (
layer = MOB_LAYER
dynamic_icon_state = TRUE
var/static/list/goliath_platable_armor_typecache = typecacheof(list(
- /obj/item/clothing/suit/space/hardsuit/mining,
- /obj/item/clothing/head/helmet/space/hardsuit/mining,
/obj/item/clothing/suit/hooded/explorer,
/obj/item/clothing/head/hooded/explorer,
/obj/item/clothing/head/helmet/space/plasmaman/mining))
diff --git a/code/modules/awaymissions/mob_spawn.dm b/code/modules/awaymissions/mob_spawn.dm
index 4fe292506fe..67f2af1e0ea 100644
--- a/code/modules/awaymissions/mob_spawn.dm
+++ b/code/modules/awaymissions/mob_spawn.dm
@@ -544,7 +544,7 @@
uniform = /obj/item/clothing/under/rank/engineering/engineer
belt = /obj/item/storage/belt/utility/full
- suit = /obj/item/clothing/suit/space/hardsuit/engine
+ back = /obj/item/mod/control/pre_equipped/engineering
shoes = /obj/item/clothing/shoes/workboots
mask = /obj/item/clothing/mask/breath
id = /obj/item/card/id/engineering
@@ -576,7 +576,7 @@
/datum/outfit/job/mining/suit
name = "Shaft Miner"
- suit = /obj/item/clothing/suit/space/hardsuit/mining
+ back = /obj/item/mod/control/pre_equipped/mining/asteroid
uniform = /obj/item/clothing/under/rank/cargo/miner
gloves = /obj/item/clothing/gloves/fingerless
shoes = /obj/item/clothing/shoes/workboots
diff --git a/code/modules/clothing/spacesuits/ert_hardsuits.dm b/code/modules/clothing/spacesuits/ert_hardsuits.dm
index c65ba817964..53de001ed8d 100644
--- a/code/modules/clothing/spacesuits/ert_hardsuits.dm
+++ b/code/modules/clothing/spacesuits/ert_hardsuits.dm
@@ -82,12 +82,6 @@
item_state = "helm-command"
item_color = "ert_commander"
-/obj/item/clothing/head/helmet/space/hardsuit/ert/commander/gamma
- name = "elite emergency response team commander helmet"
- max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- icon_state = "hardsuit0-gammacommander"
- item_color = "gammacommander"
-
/obj/item/clothing/suit/space/hardsuit/ert/commander
name = "emergency response team commander suit"
desc = "A suit worn by the commander of a Nanotrasen Emergency Response Team. Has blue highlights. Armoured, space ready, and fire resistant."
@@ -95,13 +89,6 @@
item_state = "suit-command"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/commander
-/obj/item/clothing/suit/space/hardsuit/ert/commander/gamma
- name = "elite emergency response team commander suit"
- max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- icon_state = "ert_gcommander"
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/commander/gamma
- slowdown = 0
-
//Security
/obj/item/clothing/head/helmet/space/hardsuit/ert/security
name = "emergency response team security helmet"
@@ -110,12 +97,6 @@
item_state = "syndicate-helm-black-red"
item_color = "ert_security"
-/obj/item/clothing/head/helmet/space/hardsuit/ert/security/gamma
- name = "elite emergency response team security helmet"
- max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- icon_state = "hardsuit0-gammasecurity"
- item_color = "gammasecurity"
-
/obj/item/clothing/suit/space/hardsuit/ert/security
name = "emergency response team security suit"
desc = "A suit worn by security members of a Nanotrasen Emergency Response Team. Has red highlights. Armoured, space ready, and fire resistant."
@@ -127,13 +108,6 @@
. = ..()
ADD_TRAIT(src, TRAIT_PUNCTURE_IMMUNE, ROUNDSTART_TRAIT)
-/obj/item/clothing/suit/space/hardsuit/ert/security/gamma
- name = "elite emergency response team security suit"
- max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- icon_state = "ert_gsecurity"
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/security/gamma
- slowdown = 0
-
//Engineer
/obj/item/clothing/head/helmet/space/hardsuit/ert/engineer
name = "emergency response team engineer helmet"
@@ -173,12 +147,6 @@
icon_state = "hardsuit0-ert_medical"
item_color = "ert_medical"
-/obj/item/clothing/head/helmet/space/hardsuit/ert/medical/gamma
- name = "elite emergency response team medical helmet"
- max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- icon_state = "hardsuit0-gammamedical"
- item_color = "gammamedical"
-
/obj/item/clothing/suit/space/hardsuit/ert/medical
name = "emergency response team medical suit"
desc = "A suit worn by medical members of a Nanotrasen Emergency Response Team. Has white highlights. Armoured and space ready."
@@ -189,13 +157,6 @@
. = ..()
ADD_TRAIT(src, TRAIT_PUNCTURE_IMMUNE, ROUNDSTART_TRAIT)
-/obj/item/clothing/suit/space/hardsuit/ert/medical/gamma
- name = "elite emergency response team medical suit"
- max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- icon_state = "ert_gmedical"
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/medical/gamma
- slowdown = 0
-
//Janitor
/obj/item/clothing/head/helmet/space/hardsuit/ert/janitor
name = "emergency response team janitor helmet"
@@ -203,25 +164,12 @@
icon_state = "hardsuit0-ert_janitor"
item_color = "ert_janitor"
-/obj/item/clothing/head/helmet/space/hardsuit/ert/janitor/gamma
- name = "elite emergency response team janitor helmet"
- max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- icon_state = "hardsuit0-gammajanitor"
- item_color = "gammajanitor"
-
/obj/item/clothing/suit/space/hardsuit/ert/janitor
name = "emergency response team janitor suit"
desc = "A suit worn by the janitorial of a Nanotrasen Emergency Response Team. Has purple highlights. Armoured, space ready, and fire resistant."
icon_state = "ert_janitor"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/janitor
-/obj/item/clothing/suit/space/hardsuit/ert/janitor/gamma
- name = "elite emergency response team janitor suit"
- max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- icon_state = "ert_gjanitor"
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/janitor/gamma
- slowdown = 0
-
//Paranormal
/obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal
name = "paranormal response unit helmet"
@@ -257,20 +205,6 @@
. = ..()
new /obj/item/nullrod(src)
-/obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor
- name = "inquisitor's helmet"
- icon_state = "hardsuit0-inquisitor"
- item_color = "inquisitor"
- armor = list(MELEE = 95, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, RAD = INFINITY, FIRE = 200, ACID = 200)
-
-/obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor
- name = "inquisitor's hardsuit"
- icon_state = "hardsuit-inquisitor"
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor
- armor = list(MELEE = 95, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, RAD = INFINITY, FIRE = 200, ACID = 200)
- slowdown = 0
-
-
// Solgov
/obj/item/clothing/head/helmet/space/hardsuit/ert/solgov
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index b91971de8c5..4c5ab8de27f 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -251,97 +251,6 @@
if(jetpack)
jetpack.on_mob_move(dir, mob)
-
-//Engineering hardsuit
-/obj/item/clothing/head/helmet/space/hardsuit/engine
- name = "engineering hardsuit helmet"
- desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
- icon_state = "hardsuit0-engineering"
- item_state = "eng_helm"
- armor = list(MELEE = 20, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 5, RAD = 150, FIRE = INFINITY, ACID = 150)
- resistance_flags = FIRE_PROOF
- item_color = "engineering"
-
-/obj/item/clothing/suit/space/hardsuit/engine
- name = "engineering hardsuit"
- desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding."
- icon_state = "hardsuit-engineering"
- item_state = "eng_hardsuit"
- armor = list(MELEE = 20, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 5, RAD = 150, FIRE = INFINITY, ACID = 150)
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine
- dog_fashion = /datum/dog_fashion/back/hardsuit
- resistance_flags = FIRE_PROOF
-
-//Atmospherics
-/obj/item/clothing/head/helmet/space/hardsuit/engine/atmos
- name = "atmospherics hardsuit helmet"
- desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has thermal shielding."
- icon_state = "hardsuit0-atmos"
- item_state = "atmos_helm"
- item_color = "atmos"
- armor = list(MELEE = 20, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 5, RAD = 15, FIRE = INFINITY, ACID = 150)
- heat_protection = HEAD //Uncomment to enable firesuit protection
- max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
-
-/obj/item/clothing/suit/space/hardsuit/engine/atmos
- name = "atmospherics hardsuit"
- desc = "A special suit that protects against hazardous, low pressure environments. Has thermal shielding."
- icon_state = "hardsuit-atmos"
- item_state = "atmos_hardsuit"
- armor = list(MELEE = 20, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 5, RAD = 15, FIRE = INFINITY, ACID = 150)
- heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection
- max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine/atmos
- dog_fashion = null
-
-//Chief Engineer's hardsuit
-/obj/item/clothing/head/helmet/space/hardsuit/engine/elite
- name = "advanced hardsuit helmet"
- desc = "An advanced helmet designed for work in a hazardous, low pressure environment. Shines with a high polish."
- icon_state = "hardsuit0-white"
- item_state = "ce_helm"
- item_color = "white"
- armor = list(MELEE = 35, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 50, RAD = INFINITY, FIRE = INFINITY, ACID = 450)
- heat_protection = HEAD //Uncomment to enable firesuit protection
- max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
-
-/obj/item/clothing/suit/space/hardsuit/engine/elite
- name = "advanced hardsuit"
- desc = "An advanced suit that protects against hazardous, low pressure environments. Shines with a high polish."
- icon_state = "hardsuit-white"
- item_state = "ce_hardsuit"
- armor = list(MELEE = 35, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 50, RAD = INFINITY, FIRE = INFINITY, ACID = 450)
- heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection
- max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine/elite
- jetpack = /obj/item/tank/jetpack/suit
- dog_fashion = null
-
-//Mining hardsuit
-/obj/item/clothing/head/helmet/space/hardsuit/mining
- name = "mining hardsuit helmet"
- desc = "A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating."
- icon_state = "hardsuit0-mining"
- item_state = "mining_helm"
- item_color = "mining"
- max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
- resistance_flags = FIRE_PROOF
- heat_protection = HEAD
- armor = list(MELEE = 20, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 50, RAD = 50, FIRE = 50, ACID = 150)
- brightness_on = 7
-
-/obj/item/clothing/suit/space/hardsuit/mining
- name = "mining hardsuit"
- desc = "A special suit that protects against hazardous, low pressure environments. Has reinforced plating."
- icon_state = "hardsuit-mining"
- item_state = "mining_hardsuit"
- max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
- resistance_flags = FIRE_PROOF
- armor = list(MELEE = 20, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 50, RAD = 50, FIRE = 50, ACID = 150)
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/bag/ore, /obj/item/pickaxe, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator)
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining
- heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-
//Syndicate hardsuit
/obj/item/clothing/head/helmet/space/hardsuit/syndi
name = "blood-red hardsuit helmet"
@@ -536,89 +445,7 @@
item_state = "hardsuit-soviet-commander"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/soviet/commander
-//Medical hardsuit
-/obj/item/clothing/head/helmet/space/hardsuit/medical
- name = "medical hardsuit helmet"
- desc = "A special helmet designed for work in a hazardous, low pressure environment. Built with lightweight materials for extra comfort, but does not protect the eyes from intense light."
- icon_state = "hardsuit0-medical"
- item_state = "medical_helm"
- item_color = "medical"
- flash_protect = FLASH_PROTECTION_NONE
- armor = list(MELEE = 20, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 5, RAD = 75, FIRE = 75, ACID = 150)
- scan_reagents = 1 //Generally worn by the CMO, so they'd get utility off of seeing reagents
-
-/obj/item/clothing/suit/space/hardsuit/medical
- name = "medical hardsuit"
- desc = "A special helmet designed for work in a hazardous, low pressure environment. Built with lightweight materials for extra comfort."
- icon_state = "hardsuit-medical"
- item_state = "medical_hardsuit"
- allowed = list(/obj/item/flashlight,/obj/item/tank/internals,/obj/item/storage/firstaid,/obj/item/healthanalyzer,/obj/item/stack/medical)
- armor = list(MELEE = 20, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 5, RAD = 75, FIRE = 75, ACID = 150)
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/medical
- slowdown = 0.5
-
- //Research Director hardsuit
-/obj/item/clothing/head/helmet/space/hardsuit/rd
- name = "prototype hardsuit helmet"
- desc = "A prototype helmet designed for research in a hazardous, low pressure environment. Scientific data flashes across the visor."
- icon_state = "hardsuit0-rd"
- item_state = "rd"
- item_color = "rd"
- flash_protect = FLASH_PROTECTION_NONE
- scan_reagents = TRUE
- armor = list(MELEE = 20, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = INFINITY, RAD = 75, FIRE = 75, ACID = 200)
- var/hud_active = FALSE
- var/explosion_detection_dist = 21
-
-/obj/item/clothing/head/helmet/space/hardsuit/rd/equipped(mob/user, slot)
- ..()
- if(slot == SLOT_HUD_HEAD)
- GLOB.doppler_arrays += src //Needed to sense the kabooms
- if(ishuman(user))
- var/mob/living/carbon/human/U = user
- if(istype(U.glasses, /obj/item/clothing/glasses/hud/diagnostic)) // If they are for some reason wearing a diagnostic hud when they put the helmet on
- return // already have a hud
- var/datum/atom_hud/DHUD = GLOB.huds[DATA_HUD_DIAGNOSTIC_BASIC]
- DHUD.add_hud_to(user)
- hud_active = TRUE
-
-
-/obj/item/clothing/head/helmet/space/hardsuit/rd/dropped(mob/living/carbon/human/user)
- ..()
- if((user.head == src) && hud_active)
- GLOB.doppler_arrays -= src
- var/datum/atom_hud/DHUD = GLOB.huds[DATA_HUD_DIAGNOSTIC_BASIC]
- DHUD.remove_hud_from(user)
-
-/obj/item/clothing/head/helmet/space/hardsuit/rd/proc/sense_explosion(x0, y0, z0, devastation_range, heavy_impact_range,
- light_impact_range, took, orig_dev_range, orig_heavy_range, orig_light_range)
- var/turf/T = get_turf(src)
- var/dx = abs(x0 - T.x)
- var/dy = abs(y0 - T.y)
- var/distance
- if(T.z != z0)
- return
- if(dx > dy)
- distance = dx
- else
- distance = dy
- if(distance > explosion_detection_dist)
- return
- display_visor_message("Explosion detected! Epicenter radius: [devastation_range], Outer radius: [heavy_impact_range], Shockwave radius: [light_impact_range]")
-
-/obj/item/clothing/suit/space/hardsuit/rd
- name = "prototype hardsuit"
- desc = "A prototype suit that protects against hazardous, low pressure environments. Fitted with extensive plating for handling explosives and dangerous research materials."
- icon_state = "hardsuit-rd"
- item_state = "hardsuit-rd"
- max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT //Same as an emergency firesuit. Not ideal for extended exposure.
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/gun/energy/wormhole_projector,
- /obj/item/hand_tele, /obj/item/aicard)
- armor = list(MELEE = 20, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = INFINITY, RAD = 75, FIRE = 75, ACID = 200)
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/rd
-
-
- //Security
+//Security
/obj/item/clothing/head/helmet/space/hardsuit/security
name = "security hardsuit helmet"
desc = "A special helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor."
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 4cb0098abff..cc753c4d261 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -469,13 +469,13 @@
else
to_chat(user, "You can't modify [target]!")
-
+// These two fluff items are commented out due to the transfer to MODsuits breaking these. Sprites are still in custom_items.dmi , but they need a resprite to work with MODsuits.
/obj/item/fluff/pyro_wintersec_kit //DarkLordpyro: Valthorne Haliber
name = "winter sec conversion kit"
desc = "A securirty hardsuit conversion kit."
icon_state = "modkit"
w_class = WEIGHT_CLASS_SMALL
-
+/*
/obj/item/fluff/pyro_wintersec_kit/afterattack(atom/target, mob/user, proximity)
if(!proximity || !ishuman(user) || user.incapacitated())
return
@@ -521,14 +521,14 @@
H.update_inv_wear_suit()
return
to_chat(user, "You can't modify [target]!")
-
+*/
/obj/item/fluff/sylus_conversion_kit //Decemviri: Sylus Cain
name = "cerberus pattern conversion kit"
desc = "A securirty hardsuit conversion kit."
icon_state = "modkit"
w_class = WEIGHT_CLASS_SMALL
-
+/*
/obj/item/fluff/sylus_conversion_kit/afterattack(atom/target, mob/user, proximity)
if(!proximity || !ishuman(user) || user.incapacitated())
return
@@ -581,7 +581,7 @@
to_chat(user, "You can't modify [target]!")
-
+*/
//////////////////////////////////
//////////// Clothing ////////////
//////////////////////////////////
diff --git a/icons/mob/clothing/species/drask/helmet.dmi b/icons/mob/clothing/species/drask/helmet.dmi
index 9d58968d0ab..a060778cd94 100644
Binary files a/icons/mob/clothing/species/drask/helmet.dmi and b/icons/mob/clothing/species/drask/helmet.dmi differ
diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi
index 26e65f732d2..4f479287105 100644
Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ
diff --git a/icons/mob/clothing/species/tajaran/helmet.dmi b/icons/mob/clothing/species/tajaran/helmet.dmi
index e479ea8a5c7..08f4afe3322 100644
Binary files a/icons/mob/clothing/species/tajaran/helmet.dmi and b/icons/mob/clothing/species/tajaran/helmet.dmi differ
diff --git a/icons/mob/clothing/species/tajaran/suit.dmi b/icons/mob/clothing/species/tajaran/suit.dmi
index 337c48b4693..d9a9352d29c 100644
Binary files a/icons/mob/clothing/species/tajaran/suit.dmi and b/icons/mob/clothing/species/tajaran/suit.dmi differ
diff --git a/icons/mob/clothing/species/unathi/helmet.dmi b/icons/mob/clothing/species/unathi/helmet.dmi
index fc6db757d5a..63368084616 100644
Binary files a/icons/mob/clothing/species/unathi/helmet.dmi and b/icons/mob/clothing/species/unathi/helmet.dmi differ
diff --git a/icons/mob/clothing/species/unathi/suit.dmi b/icons/mob/clothing/species/unathi/suit.dmi
index e1964adac4f..59c8faa766a 100644
Binary files a/icons/mob/clothing/species/unathi/suit.dmi and b/icons/mob/clothing/species/unathi/suit.dmi differ
diff --git a/icons/mob/clothing/species/vox/helmet.dmi b/icons/mob/clothing/species/vox/helmet.dmi
index d7fb92eea9b..47e6adb7b52 100644
Binary files a/icons/mob/clothing/species/vox/helmet.dmi and b/icons/mob/clothing/species/vox/helmet.dmi differ
diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi
index 7ae4ba7d2b9..e713793e1a7 100644
Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ
diff --git a/icons/mob/clothing/species/vulpkanin/helmet.dmi b/icons/mob/clothing/species/vulpkanin/helmet.dmi
index 24c0283c0e2..afc6ea5edf2 100644
Binary files a/icons/mob/clothing/species/vulpkanin/helmet.dmi and b/icons/mob/clothing/species/vulpkanin/helmet.dmi differ
diff --git a/icons/mob/clothing/species/vulpkanin/suit.dmi b/icons/mob/clothing/species/vulpkanin/suit.dmi
index 3cdf1a1228b..f03f0627393 100644
Binary files a/icons/mob/clothing/species/vulpkanin/suit.dmi and b/icons/mob/clothing/species/vulpkanin/suit.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index aaf4877597a..c5c655fb781 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 310f5777e44..f2030353f36 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ