mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
Merge pull request #188 from BadClownSS13/master
Added dynamic areas, currently the only one sits under customs.
This commit is contained in:
ZomgPonies
+63
-4
@@ -5,6 +5,65 @@
|
||||
// END_INTERNALS
|
||||
// BEGIN_FILE_DIR
|
||||
#define FILE_DIR .
|
||||
#define FILE_DIR "code"
|
||||
#define FILE_DIR "code/TriDimension"
|
||||
#define FILE_DIR "code/WorkInProgress"
|
||||
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn"
|
||||
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jungle"
|
||||
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust"
|
||||
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/ShieldGen"
|
||||
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter"
|
||||
#define FILE_DIR "code/WorkInProgress/Susan"
|
||||
#define FILE_DIR "html"
|
||||
#define FILE_DIR "icons"
|
||||
#define FILE_DIR "icons/48x48"
|
||||
#define FILE_DIR "icons/ass"
|
||||
#define FILE_DIR "icons/effects"
|
||||
#define FILE_DIR "icons/mecha"
|
||||
#define FILE_DIR "icons/misc"
|
||||
#define FILE_DIR "icons/mob"
|
||||
#define FILE_DIR "icons/mob/human_races"
|
||||
#define FILE_DIR "icons/mob/otherHuman"
|
||||
#define FILE_DIR "icons/NTOS"
|
||||
#define FILE_DIR "icons/obj"
|
||||
#define FILE_DIR "icons/obj/assemblies"
|
||||
#define FILE_DIR "icons/obj/atmospherics"
|
||||
#define FILE_DIR "icons/obj/clothing"
|
||||
#define FILE_DIR "icons/obj/doors"
|
||||
#define FILE_DIR "icons/obj/flora"
|
||||
#define FILE_DIR "icons/obj/machines"
|
||||
#define FILE_DIR "icons/obj/pipes"
|
||||
#define FILE_DIR "icons/obj/power_cond"
|
||||
#define FILE_DIR "icons/pda_icons"
|
||||
#define FILE_DIR "icons/pods"
|
||||
#define FILE_DIR "icons/spideros_icons"
|
||||
#define FILE_DIR "icons/stamp_icons"
|
||||
#define FILE_DIR "icons/Testing"
|
||||
#define FILE_DIR "icons/turf"
|
||||
#define FILE_DIR "icons/vending_icons"
|
||||
#define FILE_DIR "nano"
|
||||
#define FILE_DIR "nano/images"
|
||||
#define FILE_DIR "sound"
|
||||
#define FILE_DIR "sound/AI"
|
||||
#define FILE_DIR "sound/ambience"
|
||||
#define FILE_DIR "sound/effects"
|
||||
#define FILE_DIR "sound/effects/turret"
|
||||
#define FILE_DIR "sound/effects/wind"
|
||||
#define FILE_DIR "sound/hallucinations"
|
||||
#define FILE_DIR "sound/items"
|
||||
#define FILE_DIR "sound/machines"
|
||||
#define FILE_DIR "sound/mecha"
|
||||
#define FILE_DIR "sound/misc"
|
||||
#define FILE_DIR "sound/music"
|
||||
#define FILE_DIR "sound/piano"
|
||||
#define FILE_DIR "sound/turntable"
|
||||
#define FILE_DIR "sound/violin"
|
||||
#define FILE_DIR "sound/voice"
|
||||
#define FILE_DIR "sound/voice/complionator"
|
||||
#define FILE_DIR "sound/voice/Serithi"
|
||||
#define FILE_DIR "sound/vox"
|
||||
#define FILE_DIR "sound/vox_fem"
|
||||
#define FILE_DIR "sound/weapons"
|
||||
// END_FILE_DIR
|
||||
// BEGIN_PREFERENCES
|
||||
#define DEBUG
|
||||
@@ -858,10 +917,10 @@
|
||||
#include "code\modules\customitems\item_spawning.dm"
|
||||
#include "code\modules\customitems\definitions\base.dm"
|
||||
#include "code\modules\destilery\main.dm"
|
||||
#include "code\modules\detectivework\detective_work.dm"
|
||||
#include "code\modules\detectivework\evidence.dm"
|
||||
#include "code\modules\detectivework\footprints_and_rag.dm"
|
||||
#include "code\modules\detectivework\scanner.dm"
|
||||
#include "code\modules\DetectiveWork\detective_work.dm"
|
||||
#include "code\modules\DetectiveWork\evidence.dm"
|
||||
#include "code\modules\DetectiveWork\footprints_and_rag.dm"
|
||||
#include "code\modules\DetectiveWork\scanner.dm"
|
||||
#include "code\modules\economy\Accounts.dm"
|
||||
#include "code\modules\economy\Accounts_DB.dm"
|
||||
#include "code\modules\economy\ATM.dm"
|
||||
|
||||
@@ -1040,7 +1040,35 @@ proc/process_ghost_teleport_locs()
|
||||
icon_state = "Theatre"
|
||||
|
||||
|
||||
// Dynamic rooms
|
||||
|
||||
/area/dynamic // Do not use.
|
||||
name = "dynamic area"
|
||||
icon_state = "purple"
|
||||
|
||||
/area/dynamic/destination // Do not use.
|
||||
name = "dynamic area destination"
|
||||
|
||||
/area/dynamic/destination/a
|
||||
name = "dynamic area destination a"
|
||||
|
||||
/area/dynamic/source // Do not use.
|
||||
name = "dynamic area source"
|
||||
|
||||
/area/dynamic/source/ai
|
||||
name = "\improper AI Core"
|
||||
|
||||
/area/dynamic/source/bar
|
||||
name = "\improper Bar"
|
||||
|
||||
/area/dynamic/source/russian
|
||||
name = "\improper Russian Lounge"
|
||||
|
||||
/area/dynamic/source/kitchen
|
||||
name = "\improper Kitchen"
|
||||
|
||||
/area/dynamic/source/chemistry
|
||||
name = "\improper Chemistry"
|
||||
|
||||
|
||||
/area/holodeck
|
||||
|
||||
@@ -152,6 +152,31 @@ var/global/datum/controller/gameticker/ticker
|
||||
//Holiday Round-start stuff ~Carn
|
||||
Holiday_Game_Start()
|
||||
|
||||
spawn(0) // Forking dynamic room selection
|
||||
var/list/area/dynamic_area_source_paths = typesof(/area/dynamic/source) - /area/dynamic/source
|
||||
var/list/area/dynamic_area_destination_paths = typesof(/area/dynamic/destination) - /area/dynamic/destination
|
||||
|
||||
for (var/dynamic_area_destination_path in dynamic_area_destination_paths)
|
||||
var/area/dynamic_area_destination = locate(dynamic_area_destination_path)
|
||||
|
||||
if (!dynamic_area_destination)
|
||||
continue
|
||||
|
||||
|
||||
var/dynamic_area_source_path = pick(dynamic_area_source_paths)
|
||||
dynamic_area_source_paths -= dynamic_area_source_path
|
||||
|
||||
var/area/dynamic_area_source = locate(dynamic_area_source_path)
|
||||
|
||||
if (!dynamic_area_source)
|
||||
continue
|
||||
|
||||
dynamic_area_source.copy_contents_to(dynamic_area_destination, 0)
|
||||
|
||||
// Turn the lights off.
|
||||
dynamic_area_destination.power_light = 0
|
||||
dynamic_area_destination.power_change()
|
||||
|
||||
//start_events() //handles random events and space dust.
|
||||
//new random event system is handled from the MC.
|
||||
|
||||
|
||||
+10726
-10667
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user