From 10cc009ca08165a6e1d3bd738f0c0576bb18c100 Mon Sep 17 00:00:00 2001 From: Bop Date: Wed, 31 Aug 2022 14:27:36 +0700 Subject: [PATCH 1/7] muh why --- .../structures/crates_lockers/closets/utility_closets.dm | 3 +-- code/modules/clothing/suits/utility.dm | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 2f7e981ac09a..0a4964748eb7 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -133,8 +133,7 @@ /obj/structure/closet/radiation/PopulateContents() ..() new /obj/item/geiger_counter(src) - new /obj/item/clothing/suit/radiation(src) - new /obj/item/clothing/head/radiation(src) + new /obj/item/clothing/suit/hooded/radiation(src) new /obj/item/storage/firstaid/toxin(src) new /obj/item/storage/pill_bottle/penacid(src) new /obj/item/storage/pill_bottle/mutadone(src) diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 3d6d8dc3382d..fd05c76d6cdb 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -116,7 +116,7 @@ * Radiation protection */ -/obj/item/clothing/head/radiation +/obj/item/clothing/head/hooded/radiation name = "radiation hood" icon_state = "rad" desc = "A hood with radiation protective properties. The label reads, 'Made with lead. Please do not consume insulation.'" @@ -129,7 +129,7 @@ resistance_flags = NONE flags_1 = RAD_PROTECT_CONTENTS_1 -/obj/item/clothing/suit/radiation +/obj/item/clothing/suit/hooded/radiation name = "radiation suit" desc = "A suit that protects against radiation. The label reads, 'Made with lead. Please do not consume insulation.'" icon_state = "rad" @@ -147,3 +147,4 @@ flags_inv = HIDEJUMPSUIT resistance_flags = NONE flags_1 = RAD_PROTECT_CONTENTS_1 + hoodtype = /obj/item/clothing/head/hooded/radiation From ed75b1dd5a2846de2ca99f7268bf9f416d850ab9 Mon Sep 17 00:00:00 2001 From: Bop Date: Wed, 31 Aug 2022 14:36:09 +0700 Subject: [PATCH 2/7] vra --- code/game/machinery/suit_storage_unit.dm | 3 +-- code/modules/cargo/exports/gear.dm | 10 ++-------- code/modules/cargo/packs.dm | 6 ++---- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 7d3a6631f84c..e42edff8465b 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -112,8 +112,7 @@ /obj/machinery/suit_storage_unit/radsuit name = "radiation suit storage unit" - suit_type = /obj/item/clothing/suit/radiation - helmet_type = /obj/item/clothing/head/radiation + suit_type = /obj/item/clothing/suit/hooded/radiation storage_type = /obj/item/geiger_counter /obj/machinery/suit_storage_unit/open diff --git a/code/modules/cargo/exports/gear.dm b/code/modules/cargo/exports/gear.dm index 170e2ac9ab3b..ca6e08f9d427 100644 --- a/code/modules/cargo/exports/gear.dm +++ b/code/modules/cargo/exports/gear.dm @@ -51,16 +51,10 @@ unit_name = "Syndicate space suit" export_types = list(/obj/item/clothing/suit/space/syndicate) - -/datum/export/gear/radhelmet - cost = 50 - unit_name = "radsuit hood" - export_types = list(/obj/item/clothing/head/radiation) - /datum/export/gear/radsuit - cost = 100 + cost = 150 unit_name = "radsuit" - export_types = list(/obj/item/clothing/suit/radiation) + export_types = list(/obj/item/clothing/suit/hooded/radiation) /datum/export/gear/biohood cost = 50 diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 3a673917ed69..d6bfdb3b1cfe 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -199,10 +199,8 @@ name = "Radiation Protection Crate" desc = "Survive the Nuclear Apocalypse and Supermatter Engine alike with two sets of Radiation suits. Each set contains a helmet, suit, and Geiger counter. We'll even throw in a bottle of vodka and some glasses too, considering the life-expectancy of people who order this." cost = 1000 - contains = list(/obj/item/clothing/head/radiation, - /obj/item/clothing/head/radiation, - /obj/item/clothing/suit/radiation, - /obj/item/clothing/suit/radiation, + contains = list(/obj/item/clothing/suit/hooded/radiation, + /obj/item/clothing/suit/hooded/radiation, /obj/item/geiger_counter, /obj/item/geiger_counter, /obj/item/reagent_containers/food/drinks/bottle/vodka, From 1ac9f60c993644d736284510f2cf449dca4662ae Mon Sep 17 00:00:00 2001 From: Bop Date: Wed, 31 Aug 2022 14:52:58 +0700 Subject: [PATCH 3/7] gulp --- code/modules/clothing/suits/utility.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index fd05c76d6cdb..4292c933e764 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -116,7 +116,7 @@ * Radiation protection */ -/obj/item/clothing/head/hooded/radiation +/obj/item/clothing/head/hooded/radiation_hood name = "radiation hood" icon_state = "rad" desc = "A hood with radiation protective properties. The label reads, 'Made with lead. Please do not consume insulation.'" @@ -147,4 +147,4 @@ flags_inv = HIDEJUMPSUIT resistance_flags = NONE flags_1 = RAD_PROTECT_CONTENTS_1 - hoodtype = /obj/item/clothing/head/hooded/radiation + hoodtype = /obj/item/clothing/head/hooded/radiation_hood From 93926c9d63dd15b1d5cd1256db04e1832d1db5dd Mon Sep 17 00:00:00 2001 From: Bop Date: Wed, 31 Aug 2022 15:07:59 +0700 Subject: [PATCH 4/7] vler --- code/modules/clothing/head/hardhat.dm | 1 + code/modules/clothing/suits/bio.dm | 1 + code/modules/clothing/suits/utility.dm | 2 ++ 3 files changed, 4 insertions(+) diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index ef8239f0dfc8..c83ec4ba12d9 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -13,6 +13,7 @@ actions_types = list(/datum/action/item_action/toggle_helmet_light) resistance_flags = FIRE_PROOF dynamic_hair_suffix = "+generic" + hattable = FALSE dog_fashion = /datum/dog_fashion/head diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 62fd135de8e1..890fe91e7837 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -9,6 +9,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE resistance_flags = ACID_PROOF flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + hattable = FALSE /obj/item/clothing/suit/bio_suit name = "bio suit" diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 3d6d8dc3382d..78e1fd346dc2 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -70,6 +70,7 @@ equip_delay_other = 70 flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH resistance_flags = NONE + hattable = FALSE /obj/item/clothing/suit/bomb_suit @@ -128,6 +129,7 @@ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH resistance_flags = NONE flags_1 = RAD_PROTECT_CONTENTS_1 + hattable = FALSE /obj/item/clothing/suit/radiation name = "radiation suit" From 38a6be5efb388fda09930fe1094190333bb171b6 Mon Sep 17 00:00:00 2001 From: Bop Date: Wed, 31 Aug 2022 15:10:08 +0700 Subject: [PATCH 5/7] Revert "gulp" This reverts commit 1ac9f60c993644d736284510f2cf449dca4662ae. --- code/modules/clothing/suits/utility.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 9388bbc56db5..a8d428d72673 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -117,7 +117,7 @@ * Radiation protection */ -/obj/item/clothing/head/hooded/radiation_hood +/obj/item/clothing/head/hooded/radiation name = "radiation hood" icon_state = "rad" desc = "A hood with radiation protective properties. The label reads, 'Made with lead. Please do not consume insulation.'" @@ -149,4 +149,4 @@ flags_inv = HIDEJUMPSUIT resistance_flags = NONE flags_1 = RAD_PROTECT_CONTENTS_1 - hoodtype = /obj/item/clothing/head/hooded/radiation_hood + hoodtype = /obj/item/clothing/head/hooded/radiation From b17cd31f5cb422feec256a7305536e5366103ada Mon Sep 17 00:00:00 2001 From: Bop Date: Wed, 31 Aug 2022 15:10:24 +0700 Subject: [PATCH 6/7] Revert "vra" This reverts commit ed75b1dd5a2846de2ca99f7268bf9f416d850ab9. --- code/game/machinery/suit_storage_unit.dm | 3 ++- code/modules/cargo/exports/gear.dm | 10 ++++++++-- code/modules/cargo/packs.dm | 6 ++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index e42edff8465b..7d3a6631f84c 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -112,7 +112,8 @@ /obj/machinery/suit_storage_unit/radsuit name = "radiation suit storage unit" - suit_type = /obj/item/clothing/suit/hooded/radiation + suit_type = /obj/item/clothing/suit/radiation + helmet_type = /obj/item/clothing/head/radiation storage_type = /obj/item/geiger_counter /obj/machinery/suit_storage_unit/open diff --git a/code/modules/cargo/exports/gear.dm b/code/modules/cargo/exports/gear.dm index ca6e08f9d427..170e2ac9ab3b 100644 --- a/code/modules/cargo/exports/gear.dm +++ b/code/modules/cargo/exports/gear.dm @@ -51,10 +51,16 @@ unit_name = "Syndicate space suit" export_types = list(/obj/item/clothing/suit/space/syndicate) + +/datum/export/gear/radhelmet + cost = 50 + unit_name = "radsuit hood" + export_types = list(/obj/item/clothing/head/radiation) + /datum/export/gear/radsuit - cost = 150 + cost = 100 unit_name = "radsuit" - export_types = list(/obj/item/clothing/suit/hooded/radiation) + export_types = list(/obj/item/clothing/suit/radiation) /datum/export/gear/biohood cost = 50 diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index d6bfdb3b1cfe..3a673917ed69 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -199,8 +199,10 @@ name = "Radiation Protection Crate" desc = "Survive the Nuclear Apocalypse and Supermatter Engine alike with two sets of Radiation suits. Each set contains a helmet, suit, and Geiger counter. We'll even throw in a bottle of vodka and some glasses too, considering the life-expectancy of people who order this." cost = 1000 - contains = list(/obj/item/clothing/suit/hooded/radiation, - /obj/item/clothing/suit/hooded/radiation, + contains = list(/obj/item/clothing/head/radiation, + /obj/item/clothing/head/radiation, + /obj/item/clothing/suit/radiation, + /obj/item/clothing/suit/radiation, /obj/item/geiger_counter, /obj/item/geiger_counter, /obj/item/reagent_containers/food/drinks/bottle/vodka, From 973892a69e950b4e45a6403cf4b6fb43d17e3fe2 Mon Sep 17 00:00:00 2001 From: Bop Date: Wed, 31 Aug 2022 15:10:36 +0700 Subject: [PATCH 7/7] Revert "muh why" This reverts commit 10cc009ca08165a6e1d3bd738f0c0576bb18c100. --- .../structures/crates_lockers/closets/utility_closets.dm | 3 ++- code/modules/clothing/suits/utility.dm | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 0a4964748eb7..2f7e981ac09a 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -133,7 +133,8 @@ /obj/structure/closet/radiation/PopulateContents() ..() new /obj/item/geiger_counter(src) - new /obj/item/clothing/suit/hooded/radiation(src) + new /obj/item/clothing/suit/radiation(src) + new /obj/item/clothing/head/radiation(src) new /obj/item/storage/firstaid/toxin(src) new /obj/item/storage/pill_bottle/penacid(src) new /obj/item/storage/pill_bottle/mutadone(src) diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index a8d428d72673..78e1fd346dc2 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -117,7 +117,7 @@ * Radiation protection */ -/obj/item/clothing/head/hooded/radiation +/obj/item/clothing/head/radiation name = "radiation hood" icon_state = "rad" desc = "A hood with radiation protective properties. The label reads, 'Made with lead. Please do not consume insulation.'" @@ -131,7 +131,7 @@ flags_1 = RAD_PROTECT_CONTENTS_1 hattable = FALSE -/obj/item/clothing/suit/hooded/radiation +/obj/item/clothing/suit/radiation name = "radiation suit" desc = "A suit that protects against radiation. The label reads, 'Made with lead. Please do not consume insulation.'" icon_state = "rad" @@ -149,4 +149,3 @@ flags_inv = HIDEJUMPSUIT resistance_flags = NONE flags_1 = RAD_PROTECT_CONTENTS_1 - hoodtype = /obj/item/clothing/head/hooded/radiation