From 7dc8f91caf253a15b6fe716425504124607fba1b Mon Sep 17 00:00:00 2001 From: Bop Date: Fri, 29 Jul 2022 08:03:26 +0700 Subject: [PATCH 1/5] no --- code/game/machinery/suit_storage_unit.dm | 5 +++-- .../structures/crates_lockers/closets/utility_closets.dm | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index ea92242d4a35..6879eefd5373 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -220,17 +220,17 @@ add_fingerprint(user) /obj/machinery/suit_storage_unit/proc/cook() + var/mob/living/mob_occupant = occupant if(uv_cycles) uv_cycles-- uv = TRUE locked = TRUE update_icon() if(occupant) - var/mob/living/mob_occupant = occupant if(uv_super) mob_occupant.adjustFireLoss(rand(20, 36)) else - mob_occupant.adjustFireLoss(rand(10, 16)) + mob_occupant.adjustFireLoss(rand(2, 8)) mob_occupant.emote("scream") addtimer(CALLBACK(src, .proc/cook), 50) else @@ -255,6 +255,7 @@ visible_message(span_notice("[src]'s door slides open. The glowing yellow lights dim to a gentle green.")) else visible_message(span_warning("[src]'s door slides open, barraging you with the nauseating smell of charred flesh.")) + mob_occupant.radiation = 0 playsound(src, 'sound/machines/airlockclose.ogg', 25, 1) var/list/things_to_clear = list() //Done this way since using GetAllContents on the SSU itself would include circuitry and such. if(suit) 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 ea1884677873..93ead73aead9 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -126,7 +126,7 @@ */ /obj/structure/closet/radiation name = "radiation suit closet" - desc = "It's a storage unit for rad-protective suits." + desc = "It's a storage unit for rad-protective suits and anti radiation first-aids." icon_state = "eng" icon_door = "eng_rad" @@ -135,6 +135,9 @@ new /obj/item/geiger_counter(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) /* * Bombsuit closet From f65fd7949f767da11b667e52dd2268fe40cf8681 Mon Sep 17 00:00:00 2001 From: Bop Date: Sat, 30 Jul 2022 07:03:20 +0700 Subject: [PATCH 2/5] pulling time --- code/game/machinery/suit_storage_unit.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 6879eefd5373..66de668f5eaf 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -297,6 +297,11 @@ open_machine() dump_contents() +/obj/machinery/suit_storage_unit/attackby(obj/item/W, mob/user) + if(default_unfasten_wrench(user, W)) + return + return + /obj/machinery/suit_storage_unit/container_resist(mob/living/user) if(!locked) open_machine() @@ -461,7 +466,7 @@ . = TRUE update_icon() -/obj/machinery/suit_storage_unit/CtrlClick(mob/user) +/obj/machinery/suit_storage_unit/AltClick(mob/user) if(!user.canUseTopic(src, !issilicon(user))) return if(state_open) @@ -471,7 +476,7 @@ if(occupant) dump_contents() // Dump out contents if someone is in there. -/obj/machinery/suit_storage_unit/AltClick(mob/user) +/obj/machinery/suit_storage_unit/CtrlShiftClick(mob/user) if(!user.canUseTopic(src, !issilicon(user)) || state_open) return locked = !locked From ee79d0d0350530405c1d4e5ab319d20acf3f9095 Mon Sep 17 00:00:00 2001 From: Bop Date: Sat, 30 Jul 2022 07:33:50 +0700 Subject: [PATCH 3/5] added radscrub spray --- .../structures/crates_lockers/closets/utility_closets.dm | 1 + code/modules/reagents/reagent_containers/spray.dm | 7 +++++++ 2 files changed, 8 insertions(+) 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 93ead73aead9..2f7e981ac09a 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -138,6 +138,7 @@ new /obj/item/storage/firstaid/toxin(src) new /obj/item/storage/pill_bottle/penacid(src) new /obj/item/storage/pill_bottle/mutadone(src) + new /obj/item/reagent_containers/spray/radbgone(src) /* * Bombsuit closet diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index f691b80e7352..2904b0526724 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -378,3 +378,10 @@ righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi' volume = 100 list_reagents = list(/datum/reagent/toxin/plantbgone = 100) + +// Rad-B-Gone +/obj/item/reagent_containers/spray/radbgone + name = "Rad-B-Gone" + desc = "Warning, do not consume." + volume = 100 + list_reagents = list(/datum/reagent/medicine/radscrub = 100) From 3f22d77ba67ab3d084f987c607c34e0ced527087 Mon Sep 17 00:00:00 2001 From: Bop Date: Sat, 30 Jul 2022 07:45:46 +0700 Subject: [PATCH 4/5] Po --- code/modules/reagents/reagent_containers/spray.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 2904b0526724..5dee8c1c34a3 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -385,3 +385,4 @@ desc = "Warning, do not consume." volume = 100 list_reagents = list(/datum/reagent/medicine/radscrub = 100) + stream_amount = 5 From 6b1cff4f3c83213fb9ea0014611fd85c5dd97f72 Mon Sep 17 00:00:00 2001 From: Bop Date: Sat, 30 Jul 2022 11:29:24 +0700 Subject: [PATCH 5/5] E --- code/game/machinery/suit_storage_unit.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 66de668f5eaf..7d3a6631f84c 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -25,7 +25,7 @@ var/uv = FALSE var/uv_super = FALSE - var/uv_cycles = 6 + var/uv_cycles = 3 var/message_cooldown var/breakout_time = 300