Makes some turning procs consistently turn clockwise

This commit is contained in:
Jordie
2017-11-20 15:24:52 +11:00
committed by CitadelStationBot
parent ac4ca767d0
commit 752bc654ae
4 changed files with 9 additions and 4 deletions
+6
View File
@@ -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, "<span class='notice'>You adjust [src]'s dish to face to the [dir2text(dir)].</span>")
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())
@@ -95,7 +95,7 @@
handle_layer()
/obj/structure/chair/proc/spin()
setDir(turn(dir, 90))
setDir(turn(dir, -90))
/obj/structure/chair/setDir(newdir)
..()
+1 -2
View File
@@ -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)
..()
@@ -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)