Merge branch 'master' into cargocratetglass

code/game/objects/effects/effect_system/effects_foam.dm

@@ -126,7 +126,7 @@
 			T.PlaceOnTop(/turf/open/floor/plating/foam, flags = CHANGETURF_INHERIT_AIR)
 		for(var/direction in GLOB.cardinals)
 			var/turf/cardinal_turf = get_step(T, direction)
-			if(get_area(cardinal_turf) != get_area(T)) //We're at an area boundary, so let's block off this turf!
+			if(get_base_area(cardinal_turf) != get_area(T)) //We're at an area boundary, so let's block off this turf!
 				new/obj/structure/foamedmetal(T)
 				break
 	flick("[icon_state]-disolve", src)

code/game/objects/effects/landmarks.dm

@@ -456,7 +456,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 			if(!SSmapping.station_room_templates[t])
 				log_world("Station room spawner placed at ([T.x], [T.y], [T.z]) has invalid ruin name of \"[t]\" in its list")
 				templates -= t
-		template_name = pickweight(templates)
+		template_name = pickweightAllowZero(templates)
 	if(!template_name)
 		GLOB.stationroom_landmarks -= src
 		qdel(src)
@@ -485,4 +485,4 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 // Landmark for the mining station
 /obj/effect/landmark/stationroom/lavaland/station
 	templates = list("Public Mining Base" = 3)
-	icon = 'icons/rooms/Lavaland/Mining.dmi'
+	icon = 'icons/rooms/Lavaland/Mining.dmi'

code/game/objects/items/crayons.dm

@@ -427,7 +427,7 @@
 /obj/item/toy/crayon/proc/can_claim_for_gang(mob/user, atom/target)
 	// Check area validity.
 	// Reject space, player-created areas, and non-station z-levels.
-	var/area/A = get_area(target)
+	var/area/A = get_base_area(target)
 	if(!A || (!is_station_level(A.z)) || !A.valid_territory)
 		to_chat(user, "<span class='warning'>[A] is unsuitable for tagging.</span>")
 		return FALSE
@@ -461,7 +461,7 @@
 		qdel(old_marking)
 
 	var/datum/antagonist/gang/G = user.mind.has_antag_datum(/datum/antagonist/gang)
-	var/area/territory = get_area(target)
+	var/area/territory = get_base_area(target)
 
 	new /obj/effect/decal/cleanable/crayon/gang(target,G.gang,"graffiti",0,user) // Heres the gang tag.
 	to_chat(user, "<span class='notice'>You tagged [territory] for your gang!</span>")

code/game/objects/structures/ai_core.dm

@@ -52,7 +52,7 @@
 	var/area/A = get_area(src)
 	if(!A.blob_allowed)
 		return FALSE
-	if(!A.power_equip)
+	if(!A.powered(EQUIP))
 		return FALSE
 	if(!SSmapping.level_trait(T.z,ZTRAIT_STATION))
 		return FALSE

code/game/objects/structures/barsigns.dm

@@ -305,7 +305,7 @@
 
 /datum/barsign/meow_mix
 	name = "Meow Mix"
-	icon = "meow_mix"
+	icon = "Meow Mix"
 	desc = "No, we don't serve catnip, officer!"
 
 /datum/barsign/hiddensigns

code/game/objects/structures/displaycase.dm

@@ -80,7 +80,7 @@
 /obj/structure/displaycase/proc/trigger_alarm()
 	//Activate Anti-theft
 	if(alert)
-		var/area/alarmed = get_area(src)
+		var/area/alarmed = get_base_area(src)
 		alarmed.burglaralert(src)
 		playsound(src, 'sound/effects/alert.ogg', 50, 1)
 

code/game/objects/structures/ghost_role_spawners.dm

@@ -619,7 +619,7 @@
 	assignedrole = "Ghost Cafe Visitor"
 	flavour_text = "Is this what life after death is like?"
 	skip_reentry_check = TRUE
-	banType = "ghostcafe"
+	banType = ROLE_GHOSTCAFE
 
 /datum/action/toggle_dead_chat_mob
 	icon_icon = 'icons/mob/mob.dmi'
@@ -642,12 +642,14 @@
 /obj/effect/mob_spawn/human/ghostcafe/special(mob/living/carbon/human/new_spawn)
 	if(new_spawn.client)
 		new_spawn.client.prefs.copy_to(new_spawn)
+		var/area/A = get_area(src)
 		var/datum/outfit/O = new /datum/outfit/ghostcafe()
 		O.equip(new_spawn, FALSE, new_spawn.client)
 		SSjob.equip_loadout(null, new_spawn, FALSE)
 		SSquirks.AssignQuirks(new_spawn, new_spawn.client, TRUE, TRUE, null, FALSE, new_spawn)
 		new_spawn.AddElement(/datum/element/ghost_role_eligibility)
 		new_spawn.AddElement(/datum/element/dusts_on_catatonia)
+		new_spawn.AddElement(/datum/element/dusts_on_leaving_area,list(A.type,/area/hilbertshotel))
 		ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT)
 		ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
 		ADD_TRAIT(new_spawn,TRAIT_PACIFISM,GHOSTROLE_TRAIT)