Merge branch 'master' into matrices

_runtimestation.dm

@@ -1,11 +0,0 @@
-/*
-Toggle this var to 1 to compile using runtime station instead.
-Useful if you're constantly having to recompile to debug something.
-*/
-#define RUNTIME_STATION 0
-
-#if RUNTIME_STATION
-	#include "modular_chomp/maps/runtime/runtime_station_defines.dm"
-	#include "modular_chomp/maps/runtime/runtime_station.dmm"
-	#define USING_MAP_DATUM /datum/map/runtime_station
-#endif

code/__defines/misc_ch.dm

@@ -14,3 +14,5 @@
 #define MAT_CARPET_PINK			"pink carpet"
 #define MAT_CARPET_PURPLE		"purple carpet"
 #define MAT_CARPET_ORANGE		"orange carpet"
+
+#define PHASE_SHIELDED 16 // Prevents shadekin phasing in/out in this area

code/game/area/Space Station 13 areas.dm

@@ -1823,7 +1823,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "\improper Vault"
 	icon_state = "nuke_storage"
 	ambience = AMBIENCE_HIGHSEC
-	limit_shadekin_phasing = TRUE // CHOMPEdit
 
 /area/security/checkpoint
 	name = "\improper Security Checkpoint"

code/game/area/Space Station 13 areas_ch.dm

@@ -126,3 +126,6 @@
 	limit_dark_respite = TRUE
 	ambience = AMBIENCE_OTHERWORLDLY
 	flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT | BLUE_SHIELDED
+
+/area/security/nuke_storage
+	flags = PHASE_SHIELDED

code/game/area/areas_ch.dm

@@ -1,3 +1,2 @@
 /area
-	var/limit_shadekin_phasing = FALSE //Allows setting areas where shadekin cannot phase in/out
 	var/limit_dark_respite = FALSE // Shadekin will die normally in an area where this is set to true

code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm

@@ -38,6 +38,9 @@
 	if(!T)
 		to_chat(src,"<span class='warning'>You can't use that here!</span>")
 		return FALSE
+	if((get_area(src).flags & PHASE_SHIELDED))	//CHOMPAdd - Mapping tools to control phasing
+		to_chat(src,"<span class='warning'>This area is preventing you from phasing!</span>")
+		return FALSE
 
 	var/brightness = T.get_lumcount() //Brightness in 0.0 to 1.0
 	darkness = 1-brightness //Invert
@@ -98,13 +101,6 @@
 		to_chat(src, "<span class='warning'>Not enough energy for that ability!</span>")
 		return FALSE
 
-	//CHOMPEdit begin - restricting areas where you can phase shift
-	var/area/A = T.loc
-	if(A?.limit_shadekin_phasing)
-		to_chat(src, "<span class='warning'>You can't use that here!</span>")
-		return FALSE
-	//CHOMPEdit end
-
 	if(!(ability_flags & AB_PHASE_SHIFTED))
 		shadekin_adjust_energy(-ability_cost)
 	playsound(src, 'sound/effects/stealthoff.ogg', 75, 1)

code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm

@@ -8,6 +8,10 @@
 		to_chat(src,"<span class='warning'>You can't use that here!</span>")
 		return FALSE
 
+	if((get_area(src).flags & PHASE_SHIELDED))	//CHOMPAdd - Mapping tools to control phasing
+		to_chat(src,"<span class='warning'>This area is preventing you from phasing!</span>")
+		return FALSE
+
 	if(shift_state && shift_state == AB_SHIFT_ACTIVE)
 		to_chat(src,"<span class='warning'>You can't do a shift while actively shifting!</span>")
 		return FALSE

code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm

@@ -4,6 +4,9 @@
 	if(!T.CanPass(src,T) || loc != T)
 		to_chat(src,"<span class='warning'>You can't use that here!</span>")
 		return FALSE
+	if((get_area(src).flags & PHASE_SHIELDED))
+		to_chat(src,"<span class='warning'>This area is preventing you from phasing!</span>")
+		return FALSE
 
 	forceMove(T)
 	var/original_canmove = canmove

maps/runtime_station.dm

@@ -0,0 +1,16 @@
+//Toggle this file if you want to compile and run an instance quicker for faster testing of non-map related things
+
+#if !defined(USING_MAP_DATUM)
+	#include "runtime_station_defines.dm"
+	#include "runtime_station.dmm"
+//Include these if you need them
+//	#include "southern_cross/southern_cross_jobs.dm"
+//	#include "southern_cross/loadout/loadout_accessories.dm"
+//	#include "southern_cross/datums/supplypacks/munitions.dm"
+//	#include "southern_cross/job/outfits.dm"
+	#define USING_MAP_DATUM /datum/map/runtime_station
+#elif !defined(MAP_OVERRIDE)
+
+	#warn A map has already been included, ignoring Southern Cross
+
+#endif

maps/southern_cross/southern_cross.dm

@@ -59,6 +59,7 @@
 
 
 //PLANETS, installations, sectors, ships, etc for the overmap, I want put here. Add new comments and includes when you make new planets
+	#include "overmap/shuttles.dm"
 	//SIF - Planet
 	#include "overmap/sectors.dm" //This is actually the sector for Sif. This also includes places like the main station and the surface
 	//KARA - Planet

modular_chomp/code/game/objects/random/mapping.dm

@@ -56,7 +56,7 @@
 /obj/effect/map_helper/no_tele/area/LateInitialize()
 	var/area/A = get_area(src)
 	if(A)
-		A.flags += BLUE_SHIELDED
+		A.flags |= BLUE_SHIELDED
 		for(var/turf/T in A.contents)
 			T.block_tele = 1
 	qdel(src)
@@ -68,4 +68,60 @@
 /obj/effect/map_helper/make_indoors/LateInitialize()
 	for(var/turf/simulated/T in Z_TURFS(z))
 		T.make_indoors()
+	qdel(src)
+
+/obj/effect/map_helper/make_indoors/area
+	name = "Area indoors maker"
+	desc = "I forcibly call make_indoors on every turf in this area."
+
+/obj/effect/map_helper/make_indoors/area/LateInitialize()
+	var/area/A = get_area(src)
+	if(A)
+		for(var/turf/simulated/T in A.contents)
+			T.make_indoors()
+	qdel(src)
+
+/obj/effect/map_helper/make_outdoors
+	name = "z-wide outdoors maker"
+	desc = "I forcibly call make_outdoors on every turf on this z-level."
+
+/obj/effect/map_helper/make_outdoors/LateInitialize()
+	for(var/turf/simulated/T in Z_TURFS(z))
+		T.make_outdoors()
+	qdel(src)
+
+/obj/effect/map_helper/make_outdoors/area
+	name = "Area outdoors maker"
+	desc = "I forcibly call make_outdoors on every turf in this area."
+
+/obj/effect/map_helper/make_outdoors/area/LateInitialize()
+	var/area/A = get_area(src)
+	if(A)
+		for(var/turf/simulated/T in A.contents)
+			T.make_outdoors()
+	qdel(src)
+
+/*
+Make this if you can figure out a way to do it for every area in that z level exclusively
+/obj/effect/map_helper/no_phaseshift
+	name = "area-wide teleport block"
+	desc = "I disable the use of all hand tele's/translocators/bluespace harpoons/telescience in my area!"
+
+/obj/effect/map_helper/no_phaseshift/LateInitialize()
+	var/area/A = get_area(src)
+	if(A)
+		A.flags += BLUE_SHIELDED
+		for(var/turf/T in A.contents)
+			T.block_tele = 1
+	qdel(src)
+*/
+
+/obj/effect/map_helper/no_phaseshift/area
+	name = "area-wide phaseshift blocker"
+	desc = "I disable the use of both shadekin and redspace phasing!"
+
+/obj/effect/map_helper/no_phaseshift/area/LateInitialize()
+	var/area/A = get_area(src)
+	if(A)
+		A.flags |= PHASE_SHIELDED
 	qdel(src)

vorestation.dme

@@ -10,7 +10,6 @@
 #define DEBUG
 // END_PREFERENCES
 // BEGIN_INCLUDE
-#include "_runtimestation.dm"
 #include "code\__spaceman_dmm.dm"
 #include "code\_away_mission_tests.dm"
 #include "code\_macros.dm"
@@ -1550,7 +1549,6 @@
 #include "code\game\objects\random\guns_and_ammo.dm"
 #include "code\game\objects\random\maintenance.dm"
 #include "code\game\objects\random\mapping.dm"
-#include "code\game\objects\random\mapping_ch.dm"
 #include "code\game\objects\random\mapping_vr.dm"
 #include "code\game\objects\random\mechs.dm"
 #include "code\game\objects\random\misc.dm"
@@ -4503,7 +4501,6 @@
 #include "maps\southern_cross\loadout\loadout_suit.dm"
 #include "maps\southern_cross\loadout\loadout_uniform.dm"
 #include "maps\southern_cross\loadout\loadout_vr.dm"
-#include "maps\southern_cross\overmap\shuttles.dm"
 #include "maps\southern_cross\structures\closets\engineering.dm"
 #include "maps\southern_cross\structures\closets\medical.dm"
 #include "maps\southern_cross\structures\closets\misc.dm"
@@ -4553,6 +4550,7 @@
 #include "modular_chomp\code\game\objects\items\clockwork\ratvarian_spear.dm"
 #include "modular_chomp\code\game\objects\items\devices\flipper.dm"
 #include "modular_chomp\code\game\objects\items\weapons\capture_crystal.dm"
+#include "modular_chomp\code\game\objects\random\mapping.dm"
 #include "modular_chomp\code\game\objects\structures\desert_planet_structures.dm"
 #include "modular_chomp\code\game\objects\structures\gargoyle.dm"
 #include "modular_chomp\code\game\objects\structures\loot_pile.dm"