diff --git a/code/modules/clothing/spacesuits/void/atmos.dm b/code/modules/clothing/spacesuits/void/atmos.dm index 105f22fb6df..67e396eab33 100644 --- a/code/modules/clothing/spacesuits/void/atmos.dm +++ b/code/modules/clothing/spacesuits/void/atmos.dm @@ -29,7 +29,7 @@ name = "atmos hardsuit helmet" desc = "A voidsuit helmet plated with an expensive heat and radiation resistant ceramic." icon_state = "atmosalt_helm" - //item_state = "atmosalt_helm" + item_state = "atmosalt_helm" armor = list(melee = 50, bullet = 45, laser = 90, energy = 45, bomb = 45, bio = 100) max_heat_protection_temperature = ATMOS_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE light_overlay = "helmet_light" @@ -37,8 +37,8 @@ /obj/item/clothing/suit/space/void/atmos/alt name = "atmos hardsuit" desc = "An expensive NanoTrasen voidsuit, rated to withstand extreme heat and even minor radiation without exceeding room temperature within." - icon_state = "atmos_voidsuitalt" - item_state = "atmos_voidsuitalt" + icon_state = "atmosalt_voidsuit" + item_state = "atmosalt_voidsuit" armor = list(melee = 50, bullet = 45, laser = 90, energy = 45, bomb = 45, bio = 100) max_heat_protection_temperature = ATMOS_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE diff --git a/code/modules/clothing/spacesuits/void/engineering.dm b/code/modules/clothing/spacesuits/void/engineering.dm index 367ad7d2b65..a330682599b 100644 --- a/code/modules/clothing/spacesuits/void/engineering.dm +++ b/code/modules/clothing/spacesuits/void/engineering.dm @@ -32,15 +32,15 @@ name = "engineering hardsuit helmet" desc = "A heavy, radiation-shielded voidsuit helmet with a surprisingly comfortable interior." icon_state = "engalt_helm" - //item_state = "engalt_helm" + item_state = "engalt_helm" armor = list(melee = 80, bullet = 70, laser = 60, energy = 65, bomb = 35, bio = 100) light_overlay = "helmet_light_dual_low" /obj/item/clothing/suit/space/void/engineering/alt name = "engineering hardsuit" desc = "A bulky industrial voidsuit. It's a few generations old, but a reliable design and radiation shielding make up for the lack of climate control." - icon_state = "eng_voidsuitalt" - item_state = "eng_voidsuitalt" + icon_state = "engalt_voidsuit" + item_state = "engalt_voidsuit" armor = list(melee = 80, bullet = 70, laser = 60, energy = 65, bomb = 35, bio = 100) /obj/item/clothing/suit/space/void/engineering/alt/New() diff --git a/code/modules/clothing/spacesuits/void/medical.dm b/code/modules/clothing/spacesuits/void/medical.dm index d40d767b411..cb95a26dd9a 100644 --- a/code/modules/clothing/spacesuits/void/medical.dm +++ b/code/modules/clothing/spacesuits/void/medical.dm @@ -31,7 +31,7 @@ name = "streamlined medical voidhelmet" desc = "A trendy, lightly radiation-shielded voidsuit helmet trimmed in a fetching blue." icon_state = "medicalalt_helm" - //item_state = "medicalalt_helm" + item_state = "medicalalt_helm" armor = list(melee = 45, bullet = 20, laser = 40, energy = 15, bomb = 0, bio = 100) light_overlay = "helmet_light_dual_green" diff --git a/code/modules/clothing/spacesuits/void/mining.dm b/code/modules/clothing/spacesuits/void/mining.dm index 73c45cb878d..ffa2394c14e 100644 --- a/code/modules/clothing/spacesuits/void/mining.dm +++ b/code/modules/clothing/spacesuits/void/mining.dm @@ -26,7 +26,7 @@ name = "frontier mining voidhelmet" desc = "An armored voidsuit helmet. Someone must have through they were pretty cool when they painted a mohawk on it." icon_state = "miningalt_helm" - //item_state = "miningalt_helm" + item_state = "miningalt_helm" armor = list(melee = 50, bullet = 15, laser = 20,energy = 5, bomb = 55, bio = 100) /obj/item/clothing/suit/space/void/mining/alt @@ -44,7 +44,7 @@ name = "mining hardsuit helmet" desc = "An armored hardsuit helmet. Provides exceptionally good protection against aggressive asteroid dwellers." icon_state = "miningref_helm" - //item_state = "miningref_helm" + item_state = "miningref_helm" armor = list(melee = 125, bullet = 80, laser = 65, energy = 15, bomb = 65, bio = 100) /obj/item/clothing/suit/space/void/mining/reinforced diff --git a/code/modules/clothing/spacesuits/void/misc.dm b/code/modules/clothing/spacesuits/void/misc.dm index 4fb23abf023..c2bd21e4d1b 100644 --- a/code/modules/clothing/spacesuits/void/misc.dm +++ b/code/modules/clothing/spacesuits/void/misc.dm @@ -1,5 +1,16 @@ //Deathsquad suit +/obj/item/clothing/head/helmet/space/deathsquad + name = "deathsquad helmet" + desc = "That's not red paint. That's real blood." + icon_state = "deathsquad_helm" + item_state = "deathsquad_helm" + armor = list(melee = 120, bullet = 150, laser = 150, energy = 65, bomb = 90, bio = 100) + item_flags = ITEM_FLAG_STOPPRESSUREDAMAGE | ITEM_FLAG_THICKMATERIAL + flags_inv = BLOCKHAIR + siemens_coefficient = 0.6 + rad_resist_type = /datum/rad_resist/deathsquad + /obj/item/clothing/suit/space/void/swat name = "\improper SWAT suit" desc = "A heavily armored suit that protects against moderate damage. Used in special operations." @@ -16,22 +27,15 @@ ..() slowdown_per_slot[slot_wear_suit] = 1 -/obj/item/clothing/head/helmet/space/deathsquad - name = "deathsquad helmet" - desc = "That's not red paint. That's real blood." - icon_state = "deathsquad_helm" - item_state = "deathsquad_helm" - armor = list(melee = 120, bullet = 150, laser = 150, energy = 65, bomb = 90, bio = 100) - item_flags = ITEM_FLAG_STOPPRESSUREDAMAGE | ITEM_FLAG_THICKMATERIAL - flags_inv = BLOCKHAIR - siemens_coefficient = 0.6 - rad_resist_type = /datum/rad_resist/deathsquad - /datum/rad_resist/deathsquad alpha_particle_resist = 59.4 MEGA ELECTRONVOLT beta_particle_resist = 13.2 MEGA ELECTRONVOLT hawking_resist = 1 ELECTRONVOLT +/obj/item/clothing/suit/space/void/deathsquad/prepared + helmet = /obj/item/clothing/head/helmet/space/deathsquad + boots = /obj/item/clothing/shoes/magboots + // Captain /obj/item/clothing/head/helmet/space/void/captain name = "captain's space helmet" @@ -70,7 +74,7 @@ name = "exploration voidsuit" desc = "A lightweight, radiation-resistant voidsuit, featuring the Expeditionary Corps emblem on its chest plate. Designed for exploring unknown planetary environments." icon_state = "explorer_voidsuit" - //item_state = "explorer_voidsuit" + item_state = "explorer_voidsuit" armor = list(melee = 20, bullet = 10, laser = 15,energy = 45, bomb = 30, bio = 100) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/device/healthanalyzer,/obj/item/device/gps,/obj/item/pinpointer/radio,/obj/item/device/bluespace_beacon,/obj/item/material/hatchet/machete,/obj/item/shovel) rad_resist_type = /datum/rad_resist/void_engi_salvage @@ -93,7 +97,7 @@ name = "salvage voidsuit" desc = "A hand-me-down salvage voidsuit. It has obviously had a lot of repair work done to its radiation shielding." icon_state = "salvage_voidsuit" - //item_state = "salvage_voidsuit" + item_state = "salvage_voidsuit" armor = list(melee = 50, bullet = 10, laser = 30,energy = 15, bomb = 35, bio = 100) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/toolbox,/obj/item/storage/briefcase/inflatable,/obj/item/device/t_scanner,/obj/item/construction/rcd) rad_resist_type = /datum/rad_resist/void_engi_salvage @@ -144,7 +148,7 @@ /obj/item/clothing/suit/space/void/knight icon_state = "hardsuit_knight" - //item_state = "hardsuit_knight" + item_state = "hardsuit_knight" name = "strange voidsuit" desc = "A bulky set of space-proof armor, that looks kinda ancient. 'Lancelot X-40' is written on the front plate." armor = list(melee = 70, bullet = 35, laser = 35, energy = 25, bomb = 55, bio = 100) @@ -156,7 +160,7 @@ /obj/item/clothing/head/helmet/space/void/optical name = "experimental voidhelmet" icon_state = "hardsuit_optical_helm" - //item_state = "hardsuit_optical_helm" + item_state = "hardsuit_optical_helm" desc = "Strange looking, smoothly contoured helmet. It looks a bit blurry." siemens_coefficient = 0 armor = list(melee = 35, bullet = 40, laser = 45, energy = 40, bomb = 20, bio = 100) @@ -164,7 +168,7 @@ /obj/item/clothing/suit/space/void/optical name = "experimental voidsuit" icon_state = "hardsuit_optical" - //item_state = "hardsuit_optical" + item_state = "hardsuit_optical" desc = "Strange black voidsuit, with some devices attached to it. It looks a bit blurry." action_button_name = "Toggle Optical Disruptor" siemens_coefficient = 0 diff --git a/icons/inv_slots/hats/hand_l_default.dmi b/icons/inv_slots/hats/hand_l_default.dmi index 716c6f8b1a8..fb4de5bd024 100644 Binary files a/icons/inv_slots/hats/hand_l_default.dmi and b/icons/inv_slots/hats/hand_l_default.dmi differ diff --git a/icons/inv_slots/hats/hand_r_default.dmi b/icons/inv_slots/hats/hand_r_default.dmi index 415082dd6b2..ea0027684b8 100644 Binary files a/icons/inv_slots/hats/hand_r_default.dmi and b/icons/inv_slots/hats/hand_r_default.dmi differ diff --git a/icons/inv_slots/hats/mob.dmi b/icons/inv_slots/hats/mob.dmi index eedb3e17e48..5db58b0b263 100644 Binary files a/icons/inv_slots/hats/mob.dmi and b/icons/inv_slots/hats/mob.dmi differ diff --git a/icons/inv_slots/hats/mob_skrell.dmi b/icons/inv_slots/hats/mob_skrell.dmi index 927ed09695f..73c0344ee6d 100644 Binary files a/icons/inv_slots/hats/mob_skrell.dmi and b/icons/inv_slots/hats/mob_skrell.dmi differ diff --git a/icons/inv_slots/hats/mob_tajaran.dmi b/icons/inv_slots/hats/mob_tajaran.dmi index 0f723b84537..7e156f008e7 100644 Binary files a/icons/inv_slots/hats/mob_tajaran.dmi and b/icons/inv_slots/hats/mob_tajaran.dmi differ diff --git a/icons/inv_slots/hats/mob_unathi.dmi b/icons/inv_slots/hats/mob_unathi.dmi index 1b20c6d6380..bd4929afd8c 100644 Binary files a/icons/inv_slots/hats/mob_unathi.dmi and b/icons/inv_slots/hats/mob_unathi.dmi differ diff --git a/icons/inv_slots/suits/hand_l_default.dmi b/icons/inv_slots/suits/hand_l_default.dmi index b4ece1ae85c..50ebef248fe 100644 Binary files a/icons/inv_slots/suits/hand_l_default.dmi and b/icons/inv_slots/suits/hand_l_default.dmi differ diff --git a/icons/inv_slots/suits/hand_r_default.dmi b/icons/inv_slots/suits/hand_r_default.dmi index 071d9afc7f6..a72b8b7ad71 100644 Binary files a/icons/inv_slots/suits/hand_r_default.dmi and b/icons/inv_slots/suits/hand_r_default.dmi differ diff --git a/icons/obj/clothing/species/tajaran/hats.dmi b/icons/obj/clothing/species/tajaran/hats.dmi index 57c902afe88..badefbcc8db 100644 Binary files a/icons/obj/clothing/species/tajaran/hats.dmi and b/icons/obj/clothing/species/tajaran/hats.dmi differ