Fixes broken shuttle and escape pod rotation (#16154)

* Fixes shuttle rotation

* Apply AA suggestions

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
This commit is contained in:
S34N
2021-06-13 18:08:15 +01:00
committed by GitHub
parent 91c3d1750d
commit 18f47d2ef3
3 changed files with 7 additions and 7 deletions
+1 -7
View File
@@ -6,10 +6,7 @@
armor = list(melee = 100, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 70) //default + ignores melee
/obj/structure/shuttle/shuttleRotate(rotation)
..()
var/matrix/M = transform
M.Turn(rotation)
transform = M
return //This override is needed to properly rotate the object when on a shuttle that is rotated.
/obj/structure/shuttle/engine
name = "engine"
@@ -30,14 +27,11 @@
opacity = 1
/obj/structure/shuttle/engine/propulsion/burst
name = "burst"
/obj/structure/shuttle/engine/propulsion/burst/left
name = "left"
icon_state = "burst_l"
/obj/structure/shuttle/engine/propulsion/burst/right
name = "right"
icon_state = "burst_r"
/obj/structure/shuttle/engine/router
@@ -7,6 +7,9 @@
canSmoothWith = null
smooth = SMOOTH_TRUE
/turf/simulated/wall/mineral/shuttleRotate(rotation)
return //This override is needed to properly rotate the object when on a shuttle that is rotated.
/turf/simulated/wall/mineral/gold
name = "gold wall"
desc = "A wall with gold plating. Swag!"
+3
View File
@@ -56,6 +56,9 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
d2 = temp
update_icon()
/obj/structure/shuttle/engine/shuttleRotate(rotation, params)
setDir(angle2dir(rotation+dir2angle(dir)))
//Fixes dpdir on shuttle rotation
/obj/structure/disposalpipe/shuttleRotate(rotation, params)
. = ..()