From 752bc654ae277ea42217295d43d23c47172d592d Mon Sep 17 00:00:00 2001 From: Jordie Date: Mon, 20 Nov 2017 15:24:52 +1100 Subject: [PATCH] Makes some turning procs consistently turn clockwise --- code/game/machinery/doppler_array.dm | 6 ++++++ code/game/objects/structures/beds_chairs/chair.dm | 2 +- code/modules/assembly/infrared.dm | 3 +-- .../particle_accelerator/particle_accelerator.dm | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 08a6100ecf..47099ed82b 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -45,8 +45,14 @@ GLOBAL_LIST_EMPTY(doppler_arrays) return if(usr.stat || usr.restrained() || !usr.canmove) return +<<<<<<< HEAD src.setDir(turn(src.dir, 90)) return +======= + setDir(turn(dir, -90)) + to_chat(usr, "You adjust [src]'s dish to face to the [dir2text(dir)].") + playsound(src, 'sound/items/screwdriver2.ogg', 50, 1) +>>>>>>> baddcf4... Merge pull request #32889 from ShizCalev/turn-consistency /obj/machinery/doppler_array/AltClick(mob/living/user) if(!istype(user) || user.incapacitated()) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 161d1fef7c..513d0a16f3 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -95,7 +95,7 @@ handle_layer() /obj/structure/chair/proc/spin() - setDir(turn(dir, 90)) + setDir(turn(dir, -90)) /obj/structure/chair/setDir(newdir) ..() diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 14286b376c..c5f219d941 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -139,8 +139,7 @@ if(usr.incapacitated()) return - setDir(turn(dir, 90)) - return + setDir(turn(dir, -90)) /obj/item/device/assembly/infra/AltClick(mob/user) ..() diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index b1b1856e37..eebe4ef8c0 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -89,7 +89,7 @@ if (anchored) to_chat(usr, "It is fastened to the floor!") return 0 - setDir(turn(dir, 90)) + setDir(turn(dir, -90)) return 1 /obj/structure/particle_accelerator/attackby(obj/item/W, mob/user, params)