cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Suggestions

Browse Source
This commit is contained in:
r4d6
2019-12-21 14:55:37 -05:00
parent c5aef98252
commit 383e09651f
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/controllers/subsystem/air.dm
View File

@@ -382,6 +382,9 @@ SUBSYSTEM_DEF(air)
CHECK_TICK CHECK_TICK
/datum/controller/subsystem/air/proc/setup_template_machinery(list/atmos_machines) /datum/controller/subsystem/air/proc/setup_template_machinery(list/atmos_machines)
if(!initialized)
return
for(var/A in atmos_machines) for(var/A in atmos_machines)
var/obj/machinery/atmospherics/AM = A var/obj/machinery/atmospherics/AM = A
AM.atmosinit() AM.atmosinit()
@@ -392,9 +395,6 @@ SUBSYSTEM_DEF(air)
AM.build_network() AM.build_network()
CHECK_TICK CHECK_TICK
if(!initialized)
return
/datum/controller/subsystem/air/proc/get_init_dirs(type, dir) /datum/controller/subsystem/air/proc/get_init_dirs(type, dir)
if(!pipe_init_dirs_cache[type]) if(!pipe_init_dirs_cache[type])
pipe_init_dirs_cache[type] = list() pipe_init_dirs_cache[type] = list()

2
code/controllers/subsystem/mapping.dm
View File

@@ -534,10 +534,8 @@ GLOBAL_LIST_EMPTY(the_station_areas)
var/list/station_room_templates = list() var/list/station_room_templates = list()
/datum/controller/subsystem/mapping/proc/seedStation() /datum/controller/subsystem/mapping/proc/seedStation()
message_admins("Seeding Station")
for(var/V in GLOB.stationroom_landmarks) for(var/V in GLOB.stationroom_landmarks)
var/obj/effect/landmark/stationroom/LM = V var/obj/effect/landmark/stationroom/LM = V
LM.load() LM.load()
message_admins("Station seeded")
if(GLOB.stationroom_landmarks.len) if(GLOB.stationroom_landmarks.len)
seedStation() //I'm sure we can trust everyone not to insert a 1x1 rooms which loads a landmark which loads a landmark which loads a la... seedStation() //I'm sure we can trust everyone not to insert a 1x1 rooms which loads a landmark which loads a landmark which loads a la...

5
code/game/objects/effects/landmarks.dm
View File

@@ -464,15 +464,14 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
var/datum/map_template/template = SSmapping.station_room_templates[template_name] var/datum/map_template/template = SSmapping.station_room_templates[template_name]
if(!template) if(!template)
return FALSE return FALSE
testing("Ruin \"[template_name]\" placed at ([T.x], [T.y], [T.z])") testing("Room \"[template_name]\" placed at ([T.x], [T.y], [T.z])")
template.load(T, centered = FALSE) template.load(T, centered = FALSE)
template.loaded++ template.loaded++
GLOB.stationroom_landmarks -= src GLOB.stationroom_landmarks -= src
qdel(src) qdel(src)
message_admins("Stationroom loaded successfully")
return TRUE return TRUE
// The landmark for the Engine // The landmark for the Engine on Box
/obj/effect/landmark/stationroom/box/engine /obj/effect/landmark/stationroom/box/engine
template_names = list("Engine SM", "Engine Singulo", "Engine Tesla") template_names = list("Engine SM", "Engine Singulo", "Engine Tesla")