Just deleted about 400 bot accounts and a bunch of spam. To mitigate this in the future, we've enabled reCaptcha on signup. Let me know if someone got caught in the crossfire.

Commit f183bd8a authored by unid15's avatar unid15 Committed by clusterfack
Browse files

Turn holodeck areas into a map element (#11593)

* Turn holodeck into a dungeon

* 2

* Remove

* Add sorted
parent f4e236c2
......@@ -988,8 +988,7 @@ proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0)
var/list/toupdate = new/list()
var/copiedobjs = list()
var/list/copiedobjs = list()
moving:
for (var/turf/T in refined_src)
......@@ -1081,9 +1080,6 @@ proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0)
for(var/obj/O in doors)
O:update_nearby_tiles()
return copiedobjs
......
/datum/map_element/dungeon/holodeck
name = "holodeck"
file_path = "maps/misc/holodeck.dmm"
/obj/machinery/computer/HolodeckControl
name = "Holodeck Control Computer"
desc = "A computer used to control a nearby holodeck."
......
......@@ -198,6 +198,16 @@ var/global/dmm_suite/preloader/_preloader = null
if(_preloader && instance)
_preloader.load(instance)
//The areas list doesn't contain areas without objects by default
//We have to add it manually
if(!areas.Find(instance))
var/area/A = instance
if(istype(A))
areas.Add(instance)
A.addSorted()
members.Remove(members[index])
//then instance the /turf and, if multiple tiles are presents, simulates the DMM underlays piling effect (only the last turf is spawned, other ones are drawn as underlays)
......
......@@ -82,11 +82,18 @@
var/list/enabled_jobs = list()
/datum/map/New()
//Map elements that should be loaded together with this map. Stuff like the holodeck areas, etc.
var/list/load_map_elements = list()
/datum/map/New()
. = ..()
src.loadZLevels(src.zLevels)
return
//The spawn below is needed
spawn()
for(var/T in load_map_elements)
load_dungeon(T)
/datum/map/proc/loadZLevels(list/levelPaths)
......
......@@ -55,6 +55,10 @@
)
enabled_jobs = list(/datum/job/trader)
load_map_elements = list(
/datum/map_element/dungeon/holodeck
)
//The central shuttle leads to both outposts
/datum/map/active/New()
. = ..()
......
This diff is collapsed.
......@@ -27,6 +27,9 @@
enabled_jobs = list(/datum/job/trader)
load_map_elements = list(
/datum/map_element/dungeon/holodeck
)
// Metaclub areas
/area/science/xenobiology/specimen_7
......
This diff is collapsed.
This diff is collapsed.
......@@ -14,5 +14,10 @@
/datum/zLevel/station,
)
load_map_elements = list(
/datum/map_element/dungeon/holodeck
)
////////////////////////////////////////////////////////////////
#include "test_box.dmm"
This diff is collapsed.
......@@ -14,5 +14,7 @@
/datum/zLevel/station,
)
load_map_elements = list(/datum/map_element/dungeon/holodeck)
////////////////////////////////////////////////////////////////
#include "test_tiny.dmm"
This diff is collapsed.
......@@ -26,6 +26,10 @@
)
enabled_jobs = list(/datum/job/trader)
load_map_elements = list(
/datum/map_element/dungeon/holodeck
)
////////////////////////////////////////////////////////////////
#include "defficiency/pipes.dm" // Atmos layered pipes.
#include "tgstation.dmm"
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment