shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2266 from Citadel-Station-13/upstream-merge-29703

Browse Source 
[MIRROR] Fixes stuff on shuttles not rotating in the proper direction
This commit is contained in:
LetterJay
2017-08-07 07:17:54 -05:00
committed by GitHub
parent c5c25639ee c3ccae5298
commit d6ef9454ed
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/shuttle.dm
+8 -8
View File
@@ -12,7 +12,7 @@
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
anchored = TRUE anchored = TRUE
// //
var/id var/id
// this should point -away- from the dockingport door, ie towards the ship // this should point -away- from the dockingport door, ie towards the ship
dir = NORTH dir = NORTH
@@ -481,7 +481,7 @@
var/rotation = 0 var/rotation = 0
if(new_dock.dir != dir) //Even when the dirs are the same rotation is coming out as not 0 for some reason if(new_dock.dir != dir) //Even when the dirs are the same rotation is coming out as not 0 for some reason
rotation = dir2angle(new_dock)-dir2angle(dir) rotation = dir2angle(new_dock.dir)-dir2angle(dir)
if ((rotation % 90) != 0) if ((rotation % 90) != 0)
rotation += (rotation % 90) //diagonal rotations not allowed, round up rotation += (rotation % 90) //diagonal rotations not allowed, round up
rotation = SimplifyDegrees(rotation) rotation = SimplifyDegrees(rotation)
@@ -527,7 +527,7 @@
return DOCKING_AREA_EMPTY return DOCKING_AREA_EMPTY
/*******************************************All onShuttleMove procs******************************************/ /*******************************************All onShuttleMove procs******************************************/
for(var/i in 1 to old_turfs.len) for(var/i in 1 to old_turfs.len)
var/turf/oldT = old_turfs[i] var/turf/oldT = old_turfs[i]
var/turf/newT = new_turfs[i] var/turf/newT = new_turfs[i]
@@ -550,9 +550,9 @@
var/atom/movable/moving_atom = thing var/atom/movable/moving_atom = thing
moving_atom.onShuttleMove(newT, oldT, rotation, movement_force, movement_direction) //atoms moving_atom.onShuttleMove(newT, oldT, rotation, movement_force, movement_direction) //atoms
moved_atoms += moving_atom moved_atoms += moving_atom
/******************************************All afterShuttleMove procs****************************************/ /******************************************All afterShuttleMove procs****************************************/
for(var/i in 1 to new_turfs.len) for(var/i in 1 to new_turfs.len)
var/turf/oldT = old_turfs[i] var/turf/oldT = old_turfs[i]
var/turf/newT = new_turfs[i] var/turf/newT = new_turfs[i]
@@ -767,7 +767,7 @@
return TRUE return TRUE
return FALSE return FALSE
// Losing all initial engines should get you 2 // Losing all initial engines should get you 2
// Adding another set of engines at 0.5 time // Adding another set of engines at 0.5 time
/obj/docking_port/mobile/proc/alter_engines(mod) /obj/docking_port/mobile/proc/alter_engines(mod)
if(mod == 0) if(mod == 0)
@@ -806,7 +806,7 @@
if(initial_engines > 0) if(initial_engines > 0)
change_per_engine = (ENGINE_COEFF_MAX - 1) / initial_engines //just linear drop to max delay change_per_engine = (ENGINE_COEFF_MAX - 1) / initial_engines //just linear drop to max delay
return Clamp(1 + delta * change_per_engine,ENGINE_COEFF_MIN,ENGINE_COEFF_MAX) return Clamp(1 + delta * change_per_engine,ENGINE_COEFF_MIN,ENGINE_COEFF_MAX)
/obj/docking_port/mobile/proc/in_flight() /obj/docking_port/mobile/proc/in_flight()
switch(mode) switch(mode)
@@ -846,7 +846,7 @@
if(launch_status == ENDGAME_LAUNCHED) if(launch_status == ENDGAME_LAUNCHED)
dock(SSshuttle.getDock("[id]_away")) //Escape pods dock at centcomm dock(SSshuttle.getDock("[id]_away")) //Escape pods dock at centcomm
mode = SHUTTLE_ENDGAME mode = SHUTTLE_ENDGAME
/obj/docking_port/mobile/emergency/on_emergency_dock() /obj/docking_port/mobile/emergency/on_emergency_dock()
return return