From 96c0a86b5fc694193c95ac97c428bf27e8d303e7 Mon Sep 17 00:00:00 2001 From: r4d6 Date: Wed, 22 Jan 2020 13:17:29 -0500 Subject: [PATCH 1/2] Make the Radiation Hardsuit a Voidsuit instead --- code/modules/cargo/packs/engineering.dm | 7 ++--- code/modules/clothing/spacesuits/hardsuit.dm | 26 ------------------- .../clothing/spacesuits/miscellaneous.dm | 26 +++++++++++++++++++ 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/code/modules/cargo/packs/engineering.dm b/code/modules/cargo/packs/engineering.dm index 8b958158e9..6492df5215 100644 --- a/code/modules/cargo/packs/engineering.dm +++ b/code/modules/cargo/packs/engineering.dm @@ -67,14 +67,15 @@ crate_name = "atmospherics hardsuit" crate_type = /obj/structure/closet/crate/secure/engineering -/datum/supply_pack/engineering/radhardsuit - name = "Radiation Hardsuit" +/datum/supply_pack/engineering/radvoidsuit + name = "Radiation Voidsuit" desc = "The Singulo is loose? Do you need to do a few changes to its containment and don't want to spent the rest of the shift under the shower? Get this Radiation Hardsuit! It protect from radiations and space only." cost = 3500 access = ACCESS_ENGINE contains = list(/obj/item/tank/internals/air, /obj/item/clothing/mask/gas, - /obj/item/clothing/suit/space/hardsuit/engine/rad) + /obj/item/clothing/suit/space/rad, + /obj/item/clothing/head/helmet/space/rad) crate_name = "radiation hardsuit" crate_type = /obj/structure/closet/crate/secure/engineering diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index c04f581425..c9753b3053 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -203,32 +203,6 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine/atmos - //Radiation -/obj/item/clothing/head/helmet/space/hardsuit/engine/rad - name = "radiation hardsuit helmet" - desc = "A special helmet that protects against radiation and space. Not much else unfortunately." - icon_state = "cespace_helmet" - item_state = "nothing" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0) - item_color = "engineering" - resistance_flags = FIRE_PROOF - rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE - actions_types = list() - -/obj/item/clothing/suit/space/hardsuit/engine/rad - name = "radiation hardsuit" - desc = "A special suit that protects against radiation and space. Not much else unfortunately." - icon_state = "hardsuit-rad" - item_state = "nothing" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0) - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine/rad - resistance_flags = FIRE_PROOF - rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE - mutantrace_variation = NONE - -/obj/item/clothing/head/helmet/space/hardsuit/engine/rad/attack_self() - return //Sprites required for flashlight - //Chief Engineer's hardsuit /obj/item/clothing/head/helmet/space/hardsuit/engine/elite name = "advanced hardsuit helmet" diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index c9c3d1ff39..82007d7e6a 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -11,6 +11,7 @@ Contains: - ERT hardsuit: Command, Sec, Engi, Med - ERT High Alarm - Command, Sec, Engi, Med - EVA spacesuit + - Radiation Spacesuit - Freedom's spacesuit (freedom from vacuum's oppression) - Carp hardsuit */ @@ -312,6 +313,31 @@ Contains: flash_protect = 0 armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 65) +//Radiation +/obj/item/clothing/head/helmet/space/rad + name = "radiation voidsuit helmet" + desc = "A special helmet that protects against radiation and space. Not much else unfortunately." + icon_state = "cespace_helmet" + item_state = "nothing" + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0) + item_color = "engineering" + resistance_flags = FIRE_PROOF + rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE + actions_types = list() + +/obj/item/clothing/suit/space/rad + name = "radiation voidsuit" + desc = "A special suit that protects against radiation and space. Not much else unfortunately." + icon_state = "hardsuit-rad" + item_state = "nothing" + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0) + resistance_flags = FIRE_PROOF + rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE + mutantrace_variation = NONE +/* +/obj/item/clothing/head/helmet/space/hardsuit/engine/rad/attack_self() + return //Sprites required for flashlight +*/ /obj/item/clothing/head/helmet/space/freedom name = "eagle helmet" desc = "An advanced, space-proof helmet. It appears to be modeled after an old-world eagle." From 869e31b27be8d8eb4f508b1c1e8d293d92a7c420 Mon Sep 17 00:00:00 2001 From: r4d6 Date: Wed, 22 Jan 2020 13:17:47 -0500 Subject: [PATCH 2/2] Removing useless code --- code/modules/clothing/spacesuits/miscellaneous.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 82007d7e6a..f9e35ca37f 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -334,10 +334,7 @@ Contains: resistance_flags = FIRE_PROOF rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE mutantrace_variation = NONE -/* -/obj/item/clothing/head/helmet/space/hardsuit/engine/rad/attack_self() - return //Sprites required for flashlight -*/ + /obj/item/clothing/head/helmet/space/freedom name = "eagle helmet" desc = "An advanced, space-proof helmet. It appears to be modeled after an old-world eagle."