diff --git a/code/modules/awaymissions/mission_code/ruins/oldstation.dm b/code/modules/awaymissions/mission_code/ruins/oldstation.dm
index a92b88485b9..83cdfd8ac5c 100644
--- a/code/modules/awaymissions/mission_code/ruins/oldstation.dm
+++ b/code/modules/awaymissions/mission_code/ruins/oldstation.dm
@@ -161,6 +161,7 @@
armor = list("melee" = 30, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 75)
item_color = "ancient"
resistance_flags = FIRE_PROOF
+ sprite_sheets = null
/obj/item/clothing/suit/space/hardsuit/ancient
name = "prototype RIG hardsuit"
@@ -170,6 +171,7 @@
armor = list("melee" = 30, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 75)
slowdown = 3
resistance_flags = FIRE_PROOF
+ sprite_sheets = null
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ancient
var/footstep = 1
diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm
index 831eb59dfd1..e97f220bd8e 100644
--- a/code/modules/clothing/spacesuits/ert.dm
+++ b/code/modules/clothing/spacesuits/ert.dm
@@ -4,6 +4,7 @@
desc = "A helmet worn by members of the Nanotrasen Emergency Response Team. Armoured and space ready."
icon_state = "hardsuit0-ert_commander"
item_state = "helm-command"
+ item_color = "ert_commander"
armor = list(melee = 45, bullet = 25, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 50)
var/obj/machinery/camera/camera
var/has_camera = TRUE
@@ -197,7 +198,6 @@
icon_state = "hardsuit-paranormal"
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
sprite_sheets = null
- actions_types = list()
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal
/obj/item/clothing/suit/space/hardsuit/ert/paranormal/New()
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 4f3f1ef353c..4c74aba8c93 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -94,7 +94,6 @@
actions_types = list(/datum/action/item_action/toggle_helmet)
var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit
-
hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran")
species_restricted = list("exclude","Diona","Wryn")
sprite_sheets = list(
@@ -143,8 +142,8 @@
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 = "atmo_helm"
- item_color = "atmospherics"
+ item_state = "atmos_helm"
+ item_color = "atmos"
armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 25)
heat_protection = HEAD //Uncomment to enable firesuit protection
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
@@ -231,7 +230,7 @@
to_chat(user, "You cannot toggle your helmet while in this [user.loc]!" )
return
on = !on
- if(on || force)
+ if(on)
to_chat(user, "You switch your hardsuit to EVA mode, sacrificing speed for space protection.")
name = initial(name)
desc = initial(desc)
@@ -275,7 +274,6 @@
linkedsuit.flags &= ~STOPSPRESSUREDMAGE
linkedsuit.cold_protection &= ~(UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS)
- linkedsuit.icon_state = "hardsuit[on]-[item_color]"
linkedsuit.update_icon()
user.update_inv_wear_suit()
user.update_inv_w_uniform()
@@ -294,6 +292,9 @@
allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword, /obj/item/restraints/handcuffs, /obj/item/tank)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi
+/obj/item/clothing/suit/space/hardsuit/syndi/update_icon()
+ icon_state = "hardsuit[on]-[item_color]"
+
//Elite Syndie suit
/obj/item/clothing/head/helmet/space/hardsuit/syndi/elite
name = "elite syndicate hardsuit helmet"
@@ -336,6 +337,7 @@
icon_state = "freedom"
item_state = "freedom"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/freedom
+ sprite_sheets = null
/obj/item/clothing/suit/space/hardsuit/syndi/freedom/update_icon()
return
@@ -345,6 +347,7 @@
desc = "An advanced, space-proof helmet. It appears to be modeled after an old-world eagle."
icon_state = "griffinhat"
item_state = "griffinhat"
+ sprite_sheets = null
/obj/item/clothing/head/helmet/space/hardsuit/syndi/freedom/update_icon()
return
@@ -427,11 +430,12 @@
icon_state = "hardsuit0-hos"
item_color = "hos"
armor = list(melee = 45, bullet = 25, laser = 30,energy = 10, bomb = 25, bio = 100, rad = 50)
+ sprite_sheets = null
/obj/item/clothing/suit/space/hardsuit/security/hos
- icon_state = "hardsuit-hos"
name = "head of security's hardsuit"
desc = "A special bulky suit that protects against hazardous, low pressure environments. Has an additional layer of armor."
+ icon_state = "hardsuit-hos"
armor = list(melee = 45, bullet = 25, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 50)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/hos
sprite_sheets = null
@@ -444,6 +448,7 @@
item_state = "singuloth_helm"
item_color = "singuloth"
armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 100)
+ sprite_sheets = null
/obj/item/clothing/suit/space/hardsuit/singuloth
icon_state = "hardsuit-singuloth"
@@ -452,6 +457,8 @@
item_state = "singuloth_hardsuit"
flags = STOPSPRESSUREDMAGE
armor = list(melee = 45, bullet = 25, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 100)
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/singuloth
+ sprite_sheets = null
/////////////SHIELDED//////////////////////////////////
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 6f72628e092..3c2f9fc732b 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -193,10 +193,7 @@
var/obj/item/W = get_active_hand()
if(istype(W))
- if(istype(W, /obj/item/clothing))
- equip_to_slot_if_possible(W, slot)
- else
- equip_to_slot_if_possible(W, slot)
+ equip_to_slot_if_possible(W, slot)
else if(!restrained())
W = get_item_by_slot(slot)
if(W)