diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 56019d22f7c..5d26f0e946e 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -9,7 +9,7 @@ anchored = 1 density = 1 damage_deflection = 15 - var/safety_mode = 0 // Temporarily stops machine if it detects a mob + var/emergency_mode = FALSE // Temporarily stops machine if it detects a mob var/icon_name = "grinder-o" var/blood = 0 var/eat_dir = WEST @@ -42,9 +42,9 @@ /obj/machinery/recycler/examine(mob/user) . = ..() - . += "The power light is [(stat & NOPOWER) ? "off" : "on"]." - . += "The safety-mode light is [safety_mode ? "on" : "off"]." - . += "The safety-sensors status light is [emagged ? "off" : "on"]." + . += "The power light is [(stat & NOPOWER) ? "off" : "on"]." + . += "The operation light is [emergency_mode ? "off. [src] has detected a forbidden object with its sensors, and has shut down temporarily." : "on. [src] is active."]" + . += "The safety sensor light is [emagged ? "off!" : "on."]" /obj/machinery/recycler/power_change() ..() @@ -73,8 +73,8 @@ /obj/machinery/recycler/emag_act(mob/user) if(!emagged) emagged = 1 - if(safety_mode) - safety_mode = 0 + if(emergency_mode) + emergency_mode = FALSE update_icon() playsound(loc, "sparks", 75, 1, -1) to_chat(user, "You use the cryptographic sequencer on the [name].") @@ -82,7 +82,7 @@ /obj/machinery/recycler/update_icon() ..() var/is_powered = !(stat & (BROKEN|NOPOWER)) - if(safety_mode) + if(emergency_mode) is_powered = 0 icon_state = icon_name + "[is_powered]" + "[(blood ? "bld" : "")]" // add the blood tag at the end @@ -98,7 +98,7 @@ return if(!anchored) return - if(safety_mode) + if(emergency_mode) return var/move_dir = get_dir(loc, AM.loc) @@ -145,14 +145,14 @@ /obj/machinery/recycler/proc/emergency_stop(mob/living/L) playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0) - safety_mode = 1 + emergency_mode = TRUE update_icon() L.loc = loc addtimer(CALLBACK(src, .proc/reboot), SAFETY_COOLDOWN) /obj/machinery/recycler/proc/reboot() playsound(loc, 'sound/machines/ping.ogg', 50, 0) - safety_mode = 0 + emergency_mode = FALSE update_icon() /obj/machinery/recycler/proc/crush_living(mob/living/L) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index e82db0ddc60..6bd3a47a87f 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -13,7 +13,9 @@ GLOBAL_LIST_INIT(conveyor_switches, list()) icon = 'icons/obj/recycling.dmi' icon_state = "conveyor_stopped_cw" name = "conveyor belt" - desc = "It's a conveyor belt, commonly used to transport large numbers of items elsewhere quite quickly." + desc = "It's a conveyor belt, commonly used to transport large numbers of items elsewhere quite quickly.
\ + Use a wrench on the belt to rotate it.
\ + Use a crowbar on the belt to dislodge it." layer = CONVEYOR_LAYER // so they appear under stuff but not below stuff like vents anchored = TRUE move_force = MOVE_FORCE_DEFAULT @@ -231,7 +233,10 @@ GLOBAL_LIST_INIT(conveyor_switches, list()) /obj/machinery/conveyor_switch name = "conveyor switch" - desc = "This switch controls any and all conveyor belts it is linked to." + desc = "This switch controls any and all conveyor belts it is linked to.
\ + Use a multitool to toggle one-way mode.
\ + Use a crowbar to dislodge it.
\ + Dislodge the switch and use it on a section of conveyor belt or conveyor placer to link them.
" icon = 'icons/obj/recycling.dmi' icon_state = "switch-off" var/position = DIRECTION_OFF @@ -338,7 +343,9 @@ GLOBAL_LIST_INIT(conveyor_switches, list()) icon = 'icons/obj/recycling.dmi' icon_state = "conveyor_loose" name = "conveyor belt assembly" - desc = "A conveyor belt assembly, used for the assembly of conveyor belt systems." + desc = "A conveyor belt assembly, used for the assembly of conveyor belt systems.
\ + Use the assembly on the ground to finalize it.
\ + Use a conveyor belt switch on the assembly to link them.
" w_class = WEIGHT_CLASS_BULKY var/id @@ -369,7 +376,9 @@ GLOBAL_LIST_INIT(conveyor_switches, list()) /obj/item/conveyor_switch_construct name = "conveyor switch assembly" - desc = "A conveyor control switch assembly. When set up, it'll control any and all conveyor belts it is linked to." + desc = "A conveyor control switch assembly. When set up, it'll control any and all conveyor belts it is linked to.
\ + Use it on a section of conveyor belt to link them together.
\ + Use the assembly on the ground to finalize it." icon = 'icons/obj/recycling.dmi' icon_state = "switch" w_class = WEIGHT_CLASS_BULKY