diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 6ffa0f37e7f..08b059888ac 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -80,6 +80,20 @@ src.set_dir(turn(src.dir, 270)) +/obj/structure/bed/chair/verb/rotate_counterclockwise() + set name = "Rotate Chair Counter-Clockwise" + set category = "Object" + set src in oview(1) + + if(!usr || !isturf(usr.loc)) + return + if(usr.stat || usr.restrained()) + return + if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction)) + return + + src.set_dir(turn(src.dir, 90)) + /obj/structure/bed/chair/shuttle name = "chair" icon_state = "shuttlechair" diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index b725f2d4f7d..f578e42a9dd 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -30,7 +30,6 @@ var/integrity = 80 - /obj/machinery/power/emitter/verb/rotate_clockwise() set name = "Rotate Emitter Clockwise" set category = "Object" @@ -42,6 +41,17 @@ src.set_dir(turn(src.dir, 270)) return 1 +/obj/machinery/power/emitter/verb/rotate_counterclockwise() + set name = "Rotate Emitter Counter-Clockwise" + set category = "Object" + set src in oview(1) + + if (src.anchored || usr:stat) + to_chat(usr, "It is fastened to the floor!") + return 0 + src.set_dir(turn(src.dir, 90)) + return 1 + /obj/machinery/power/emitter/Initialize() . = ..() if(state == 2 && anchored) @@ -274,7 +284,7 @@ . = ..() switch(state) if(0) - . += "It is not secured in place at all!" + . += "It is not secured in place!" if(1) . += "It has been bolted down securely, but not welded into place." if(2) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 4a85e1fec55..758523b4879 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -44,7 +44,7 @@ field_generator power level display . = ..() switch(state) if(0) - . += "It is not secured in place at all!" + . += "It is not secured in place!" if(1) . += "It has been bolted down securely, but not welded into place." if(2) diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm index a41ea2fd490..e0311fdb56e 100644 --- a/code/modules/power/singularity/generator.dm +++ b/code/modules/power/singularity/generator.dm @@ -12,7 +12,10 @@ /obj/machinery/the_singularitygen/examine() . = ..() - . += "It is [anchored ? "secured" : "not secured"]!" + if(anchored) + . += "It is not secured!" + else + . += "It has been securely bolted down and is ready for operation." /obj/machinery/the_singularitygen/process() var/turf/T = get_turf(src) diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index e36a1f1dc31..18530e22eef 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -23,7 +23,10 @@ /obj/machinery/power/tesla_coil/examine() . = ..() - . += "It is [anchored ? "secured" : "not secured"]!" + if(anchored) + . += "It is not secured!" + else + . += "It has been securely bolted down and is ready for operation." /obj/machinery/power/tesla_coil/New() ..() @@ -113,7 +116,10 @@ /obj/machinery/power/grounding_rod/examine() . = ..() - . += "It is [anchored ? "secured" : "not secured"]!" + if(anchored) + . += "It is not secured!" + else + . += "It has been securely bolted down and is ready for operation." /obj/machinery/power/grounding_rod/pre_mapped anchored = TRUE diff --git a/code/modules/power/tesla/generator.dm b/code/modules/power/tesla/generator.dm index 668dfe4e0ab..63bce099fab 100644 --- a/code/modules/power/tesla/generator.dm +++ b/code/modules/power/tesla/generator.dm @@ -5,10 +5,6 @@ icon_state = "TheSingGen" creation_type = /obj/singularity/energy_ball -/obj/machinery/the_singularitygen/tesla/examine() - . = ..() - . += "It is [anchored ? "secured" : "not secured"]!" - /obj/machinery/the_singularitygen/tesla/tesla_act(power, explosive = FALSE) if(explosive) energy += power