Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions code/game/machinery/suit_storage_unit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand Down Expand Up @@ -296,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()
Expand Down Expand Up @@ -460,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)
Expand All @@ -470,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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -135,6 +135,10 @@
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)
new /obj/item/reagent_containers/spray/radbgone(src)

/*
* Bombsuit closet
Expand Down
8 changes: 8 additions & 0 deletions code/modules/reagents/reagent_containers/spray.dm
Original file line number Diff line number Diff line change
Expand Up @@ -378,3 +378,11 @@
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)
stream_amount = 5