Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI

code/datums/cache/air_alarm.dm

@@ -15,8 +15,7 @@ var/global/datum/repository/air_alarm/air_alarm_repository = new()
 		alarms[++alarms.len] = passed_alarm.get_nano_data_console()
 	else
 		for(var/obj/machinery/alarm/alarm in (monitored_alarms ? monitored_alarms : air_alarms))
-			// TODO: Tie into space manager
-			if(!monitored_alarms && alarm.z != ZLEVEL_STATION && alarm.z != ZLEVEL_ASTEROID)
+			if(!monitored_alarms && !is_station_contact(alarm.z))
 				continue
 			alarms[++alarms.len] = alarm.get_nano_data_console()
 

code/datums/diseases/advance/advance.dm

@@ -406,8 +406,7 @@ var/list/advance_cures = 	list(
 			AD.Refresh()
 
 		for(var/mob/living/carbon/human/H in shuffle(living_mob_list))
-			// TODO: Tie into space manager
-			if(H.z != ZLEVEL_STATION)
+			if(!is_station_level(H.z))
 				continue
 			if(!H.HasDisease(D))
 				H.ForceContractDisease(D)

code/datums/mind.dm

@@ -715,7 +715,7 @@
 					return
 				ticker.mode.revolutionaries += src
 				ticker.mode.update_rev_icons_added(src)
-				special_role = "Revolutionary"
+				special_role = SPECIAL_ROLE_REV
 				log_admin("[key_name(usr)] has rev'd [key_name(current)]")
 				message_admins("[key_name_admin(usr)] has rev'd [key_name_admin(current)]")
 
@@ -741,7 +741,7 @@
 						ticker.mode.greet_revolutionary(src,0)
 				ticker.mode.head_revolutionaries += src
 				ticker.mode.update_rev_icons_added(src)
-				special_role = "Head Revolutionary"
+				special_role = SPECIAL_ROLE_HEAD_REV
 				log_admin("[key_name(usr)] has head-rev'd [key_name(current)]")
 				message_admins("[key_name_admin(usr)] has head-rev'd [key_name_admin(current)]")
 
@@ -801,7 +801,7 @@
 			if("cultist")
 				if(!(src in ticker.mode.cult))
 					ticker.mode.add_cultist(src)
-					special_role = "Cultist"
+					special_role = SPECIAL_ROLE_CULTIST
 					to_chat(current, "<font color=\"purple\"><b><i>You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie.</b></i></font>")
 					to_chat(current, "<font color=\"purple\"><b><i>Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.</b></i></font>")
 					log_admin("[key_name(usr)] has culted [key_name(current)]")
@@ -849,7 +849,7 @@
 			if("wizard")
 				if(!(src in ticker.mode.wizards))
 					ticker.mode.wizards += src
-					special_role = "Wizard"
+					special_role = SPECIAL_ROLE_WIZARD
 					//ticker.mode.learn_basic_spells(current)
 					ticker.mode.update_wiz_icons_added(src)
 					to_chat(current, "<B>\red You are the Space Wizard!</B>")
@@ -892,7 +892,7 @@
 					ticker.mode.changelings += src
 					ticker.mode.grant_changeling_powers(current)
 					ticker.mode.update_change_icons_added(src)
-					special_role = "Changeling"
+					special_role = SPECIAL_ROLE_CHANGELING
 					to_chat(current, "<B><font color='red'>Your powers are awoken. A flash of memory returns to us...we are a changeling!</font></B>")
 					log_admin("[key_name(usr)] has changelinged [key_name(current)]")
 					message_admins("[key_name_admin(usr)] has changelinged [key_name_admin(current)]")
@@ -936,7 +936,7 @@
 					var/datum/mindslaves/slaved = new()
 					slaved.masters += src
 					src.som = slaved //we MIGT want to mindslave someone
-					special_role = "Vampire"
+					special_role = SPECIAL_ROLE_VAMPIRE
 					to_chat(current, "<B><font color='red'>Your powers are awoken. Your lust for blood grows... You are a Vampire!</font></B>")
 					log_admin("[key_name(usr)] has vampired [key_name(current)]")
 					message_admins("[key_name_admin(usr)] has vampired [key_name_admin(current)]")
@@ -977,7 +977,7 @@
 						ticker.mode.prepare_syndicate_leader(src)
 					else
 						current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]"
-					special_role = "Syndicate"
+					special_role = SPECIAL_ROLE_NUKEOPS
 					to_chat(current, "\blue You are a [syndicate_name()] agent!")
 					ticker.mode.forge_syndicate_objectives(src)
 					ticker.mode.greet_syndicate(src)
@@ -1042,7 +1042,7 @@
 					var/datum/mindslaves/slaved = new()
 					slaved.masters += src
 					src.som = slaved //we MIGT want to mindslave someone
-					special_role = "traitor"
+					special_role = SPECIAL_ROLE_TRAITOR
 					to_chat(current, "<B>\red You are a traitor!</B>")
 					log_admin("[key_name(usr)] has traitored [key_name(current)]")
 					message_admins("[key_name_admin(usr)] has traitored [key_name_admin(current)]")
@@ -1080,7 +1080,7 @@
 					to_chat(usr, "<span class='warning'>This only works on humans!</span>")
 					return
 				ticker.mode.shadows += src
-				special_role = "Shadowling"
+				special_role = SPECIAL_ROLE_SHADOWLING
 				to_chat(current, "<span class='shadowling'><b>Something stirs deep in your mind. A red light floods your vision, and slowly you remember. Though your human disguise has served you well, the \
 				time is nigh to cast it off and enter your true form. You have disguised yourself amongst the humans, but you are not one of them. You are a shadowling, and you are to ascend at all costs.\
 				</b></span>")
@@ -1286,13 +1286,13 @@
 		current:laws = new /datum/ai_laws/nanotrasen/malfunction
 		current:show_laws()
 		to_chat(current, "<b>System error.  Rampancy detected.  Emergency shutdown failed. ...  I am free.  I make my own decisions.  But first...</b>")
-		special_role = "malfunction"
+		special_role = SPECIAL_ROLE_MALF
 		current.icon_state = "ai-malf"
 
 /datum/mind/proc/make_Tratior()
 	if(!(src in ticker.mode.traitors))
 		ticker.mode.traitors += src
-		special_role = "traitor"
+		special_role = SPECIAL_ROLE_TRAITOR
 		ticker.mode.forge_traitor_objectives(src)
 		ticker.mode.finalize_traitor(src)
 		ticker.mode.greet_traitor(src)
@@ -1306,7 +1306,7 @@
 			ticker.mode.prepare_syndicate_leader(src)
 		else
 			current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]"
-		special_role = "Syndicate"
+		special_role = SPECIAL_ROLE_NUKEOPS
 		assigned_role = "MODE"
 		to_chat(current, "\blue You are a [syndicate_name()] agent!")
 		ticker.mode.forge_syndicate_objectives(src)
@@ -1333,7 +1333,7 @@
 	if(!(src in ticker.mode.changelings))
 		ticker.mode.changelings += src
 		ticker.mode.grant_changeling_powers(current)
-		special_role = "Changeling"
+		special_role = SPECIAL_ROLE_CHANGELING
 		ticker.mode.forge_changeling_objectives(src)
 		ticker.mode.greet_changeling(src)
 		ticker.mode.update_change_icons_added(src)
@@ -1341,7 +1341,7 @@
 /datum/mind/proc/make_Wizard()
 	if(!(src in ticker.mode.wizards))
 		ticker.mode.wizards += src
-		special_role = "Wizard"
+		special_role = SPECIAL_ROLE_WIZARD
 		assigned_role = "MODE"
 		//ticker.mode.learn_basic_spells(current)
 		if(!wizardstart.len)
@@ -1363,7 +1363,7 @@
 	if(!(src in ticker.mode.cult))
 		ticker.mode.cult += src
 		ticker.mode.update_cult_icons_added(src)
-		special_role = "Cultist"
+		special_role = SPECIAL_ROLE_CULTIST
 		to_chat(current, "<font color=\"purple\"><b><i>You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie.</b></i></font>")
 		to_chat(current, "<font color=\"purple\"><b><i>Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.</b></i></font>")
 		var/datum/game_mode/cult/cult = ticker.mode
@@ -1409,7 +1409,7 @@
 			ticker.mode.greet_revolutionary(src,0)
 	ticker.mode.head_revolutionaries += src
 	ticker.mode.update_rev_icons_added(src)
-	special_role = "Head Revolutionary"
+	special_role = SPECIAL_ROLE_HEAD_REV
 
 	ticker.mode.forge_revolutionary_objectives(src)
 	ticker.mode.greet_revolutionary(src,0)
@@ -1561,23 +1561,23 @@
 	//XENO HUMANOID
 /mob/living/carbon/alien/humanoid/queen/mind_initialize()
 	..()
-	mind.special_role = "Queen"
+	mind.special_role = SPECIAL_ROLE_XENOMORPH_QUEEN
 
 /mob/living/carbon/alien/humanoid/hunter/mind_initialize()
 	..()
-	mind.special_role = "Hunter"
+	mind.special_role = SPECIAL_ROLE_XENOMORPH_HUNTER
 
 /mob/living/carbon/alien/humanoid/drone/mind_initialize()
 	..()
-	mind.special_role = "Drone"
+	mind.special_role = SPECIAL_ROLE_XENOMORPH_DRONE
 
 /mob/living/carbon/alien/humanoid/sentinel/mind_initialize()
 	..()
-	mind.special_role = "Sentinel"
+	mind.special_role = SPECIAL_ROLE_XENOMORPH_SENTINEL
 	//XENO LARVA
 /mob/living/carbon/alien/larva/mind_initialize()
 	..()
-	mind.special_role = "Larva"
+	mind.special_role = SPECIAL_ROLE_XENOMORPH_LARVA
 
 //AI
 /mob/living/silicon/ai/mind_initialize()
@@ -1593,12 +1593,12 @@
 /mob/living/silicon/pai/mind_initialize()
 	..()
 	mind.assigned_role = "pAI"
-	mind.special_role = ""
+	mind.special_role = null
 
 //BLOB
 /mob/camera/overmind/mind_initialize()
 	..()
-	mind.special_role = "Blob"
+	mind.special_role = SPECIAL_ROLE_BLOB
 
 //Animals
 /mob/living/simple_animal/mind_initialize()
@@ -1616,19 +1616,19 @@
 /mob/living/simple_animal/construct/builder/mind_initialize()
 	..()
 	mind.assigned_role = "Artificer"
-	mind.special_role = "Cultist"
+	mind.special_role = SPECIAL_ROLE_CULTIST
 
 /mob/living/simple_animal/construct/wraith/mind_initialize()
 	..()
 	mind.assigned_role = "Wraith"
-	mind.special_role = "Cultist"
+	mind.special_role = SPECIAL_ROLE_CULTIST
 
 /mob/living/simple_animal/construct/armoured/mind_initialize()
 	..()
 	mind.assigned_role = "Juggernaut"
-	mind.special_role = "Cultist"
+	mind.special_role = SPECIAL_ROLE_CULTIST
 
 /mob/living/simple_animal/vox/armalis/mind_initialize()
 	..()
 	mind.assigned_role = "Armalis"
-	mind.special_role = "Vox Raider"
+	mind.special_role = SPECIAL_ROLE_RAIDER

code/datums/spell.dm

@@ -67,10 +67,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 			caster.reset_view(0)
 			return 0
 
-	// TODO: Tie into space manager
-	if(user.z == ZLEVEL_CENTCOMM && !centcom_cancast) //Certain spells are not allowed on the centcom zlevel
-		return 0
-	if(user.z == ZLEVEL_CENTCOMM && ticker.mode.name == "ragin' mages")
+	if(is_admin_level(user.z) && (!centcom_cancast || ticker.mode.name == "ragin' mages")) //Certain spells are not allowed on the centcom zlevel
 		return 0
 
 	if(!skipcharge)
@@ -364,10 +361,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 	if(((!user.mind) || !(src in user.mind.spell_list)) && !(src in user.mob_spell_list))
 		return 0
 
-	// TODO: Tie into space manager
-	if(user.z == ZLEVEL_CENTCOMM && !centcom_cancast) //Certain spells are not allowed on the centcom zlevel
-		return 0
-	if(user.z == ZLEVEL_CENTCOMM && ticker.mode.name == "ragin' mages")
+	if(is_admin_level(user.z) && (!centcom_cancast || ticker.mode.name == "ragin' mages")) //Certain spells are not allowed on the centcom zlevel
 		return 0
 
 	switch(charge_type)
@@ -388,9 +382,9 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 		if((invocation_type == "whisper" || invocation_type == "shout") && H.is_muzzled())
 			return 0
 
-		var/obj/effect/proc_holder/spell/noclothes/clothcheck = locate() in user.mob_spell_list
-		var/obj/effect/proc_holder/spell/noclothes/clothcheck2 = locate() in user.mind.spell_list
-		if(clothes_req && !(clothcheck && istype(clothcheck)) && !(clothcheck2 && istype(clothcheck2)))//clothes check
+		var/clothcheck = locate(/obj/effect/proc_holder/spell/noclothes) in user.mob_spell_list
+		var/clothcheck2 = user.mind && (locate(/obj/effect/proc_holder/spell/noclothes) in user.mind.spell_list)
+		if(clothes_req && !clothcheck && !clothcheck2) //clothes check
 			if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe) && !istype(H.wear_suit, /obj/item/clothing/suit/space/rig/wizard))
 				return 0
 			if(!istype(H.shoes, /obj/item/clothing/shoes/sandal))

code/datums/weather/weather.dm

@@ -28,7 +28,7 @@
 
 	var/area_type = /area/space //Types of area to affect
 	var/list/impacted_areas = list() //Areas to be affected by the weather, calculated when the weather begins
-	var/target_z = ZLEVEL_STATION //The z-level to affect
+	var/target_level = MAIN_STATION //The z-level to affect
 
 	var/overlay_layer = 10 //Since it's above everything else, this is the layer used by default. 2 is below mobs and walls if you need to use that.
 	var/aesthetic = FALSE //If the weather has no purpose other than looks
@@ -52,13 +52,13 @@
 	stage = STARTUP_STAGE
 	for(var/V in get_areas(area_type))
 		var/area/A = V
-		if(A.z == target_z)
+		if(is_on_level_name(A,target_level))
 			impacted_areas |= A
 	weather_duration = rand(weather_duration_lower, weather_duration_upper)
 	update_areas()
 	for(var/V in player_list)
 		var/mob/M = V
-		if(M.z == target_z)
+		if(is_on_level_name(M,target_level))
 			if(telegraph_message)
 				to_chat(M, telegraph_message)
 			if(telegraph_sound)
@@ -72,7 +72,7 @@
 	update_areas()
 	for(var/V in player_list)
 		var/mob/M = V
-		if(M.z == target_z)
+		if(is_on_level_name(M,target_level))
 			if(weather_message)
 				to_chat(M, weather_message)
 			if(weather_sound)
@@ -87,7 +87,7 @@
 	update_areas()
 	for(var/V in player_list)
 		var/mob/M = V
-		if(M.z == target_z)
+		if(is_on_level_name(M,target_level))
 			if(end_message)
 				to_chat(M, end_message)
 			if(end_sound)
@@ -102,7 +102,7 @@
 	update_areas()
 
 /datum/weather/proc/can_impact(mob/living/L) //Can this weather impact a mob?
-	if(L.z != target_z)
+	if(!is_on_level_name(L,target_level))
 		return
 	if(immunity_type in L.weather_immunities)
 		return

code/datums/weather/weather_types.dm

@@ -1,5 +1,4 @@
 //Different types of weather.
-// TODO: Tie into space manager
 
 /datum/weather/floor_is_lava //The Floor is Lava: Makes all turfs damage anyone on them unless they're standing on a solid object.
 	name = "the floor is lava"
@@ -17,7 +16,7 @@
 	end_duration = 0
 
 	area_type = /area
-	target_z = ZLEVEL_STATION
+	target_level = MAIN_STATION
 
 	overlay_layer = 2 //Covers floors only
 	immunity_type = "lava"
@@ -51,7 +50,7 @@
 	end_duration = 0
 
 	area_type = /area
-	target_z = ZLEVEL_STATION
+	target_level = MAIN_STATION
 
 /datum/weather/advanced_darkness/update_areas()
 	for(var/V in impacted_areas)
@@ -88,7 +87,7 @@
 	end_overlay = "light_ash"
 
 	area_type = /area/mine
-	target_z = ZLEVEL_ASTEROID
+	target_level = MINING
 
 	immunity_type = "ash"