cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-24 05:36:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'polaris/master' into PS_PORT_SCHEDULER

Browse Source
This commit is contained in:
kevinz000
2018-12-09 20:34:39 -08:00
parent 0a2178d01f 8430fe5434
commit ab3f30b28f
234 changed files with 1365 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/overmap/ships/computers/engine_control.dm
+1 -1
View File
@@ -8,7 +8,7 @@
var/list/engines = list()
var/obj/effect/map/ship/linked
/obj/machinery/computer/engines/initialize()
/obj/machinery/computer/engines/Initialize()
. = ..()
linked = map_sectors["[z]"]
if (linked)
code/modules/overmap/ships/computers/helm.dm
+1 -1
View File
@@ -10,7 +10,7 @@
var/dx //desitnation
var/dy //coordinates
/obj/machinery/computer/helm/initialize()
/obj/machinery/computer/helm/Initialize()
. = ..()
linked = map_sectors["[z]"]
if (linked)
code/modules/overmap/ships/computers/shuttle.dm
+1 -1
View File
@@ -8,7 +8,7 @@
var/obj/effect/map/destination //current destination
var/obj/effect/map/home //current destination
/obj/machinery/computer/shuttle_control/explore/initialize()
/obj/machinery/computer/shuttle_control/explore/Initialize()
. = ..()
home = map_sectors["[z]"]
shuttle_tag = "[shuttle_tag]-[z]"
code/modules/overmap/ships/engines/thermal.dm
+1 -1
View File
@@ -53,7 +53,7 @@
var/effective_pressure = 3000
var/datum/ship_engine/thermal/controller
/obj/machinery/atmospherics/unary/engine/initialize()
/obj/machinery/atmospherics/unary/engine/Initialize()
. = ..()
controller = new(src)
code/modules/overmap/ships/ship.dm
+1 -1
View File
@@ -14,7 +14,7 @@
var/obj/machinery/computer/helm/nav_control
var/obj/machinery/computer/engines/eng_control
/obj/effect/map/ship/initialize()
/obj/effect/map/ship/Initialize()
. = ..()
for(var/obj/machinery/computer/engines/E in machines)
if (E.z == map_z)