Merge conflict begone

code/game/objects/structures/crates_lockers/closets.dm

@@ -46,11 +46,6 @@
 	update_icon()
 	PopulateContents()
 
-	RegisterSignal(src, COMSIG_ATOM_CANREACH, .proc/canreach_react)
-
-/obj/structure/closet/proc/canreach_react(datum/source, list/next)
-	return COMPONENT_BLOCK_REACH //closed block, open have nothing inside.
-
 //USE THIS TO FILL IT, NOT INITIALIZE OR NEW
 /obj/structure/closet/proc/PopulateContents()
 	return
@@ -61,6 +56,8 @@
 
 /obj/structure/closet/update_icon()
 	. = ..()
+	if (istype(src, /obj/structure/closet/supplypod))
+		return
 	if(!opened)
 		layer = OBJ_LAYER
 	else
@@ -337,8 +334,11 @@
 			var/mob/living/L = O
 			if(!issilicon(L))
 				L.Paralyze(40)
-			O.forceMove(T)
-			close()
+			if(istype(src, /obj/structure/closet/supplypod/extractionpod))
+				O.forceMove(src)
+			else
+				O.forceMove(T)
+				close()
 	else
 		O.forceMove(T)
 	return 1

code/game/objects/structures/divine.dm

@@ -1,22 +1,22 @@
 /obj/structure/sacrificealtar
 	name = "sacrificial altar"
-	desc = "An altar designed to perform blood sacrifice for a deity."
+	desc = "An altar designed to perform blood sacrifice for a deity. Alt-click it to sacrifice a buckled creature."
 	icon = 'icons/obj/hand_of_god_structures.dmi'
 	icon_state = "sacrificealtar"
 	anchored = TRUE
 	density = FALSE
 	can_buckle = 1
 
-/obj/structure/sacrificealtar/attack_hand(mob/living/user)
-	. = ..()
-	if(.)
+/obj/structure/sacrificealtar/AltClick(mob/living/user)
+	..()
+	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE))
 		return
 	if(!has_buckled_mobs())
 		return
 	var/mob/living/L = locate() in buckled_mobs
 	if(!L)
 		return
-	to_chat(user, "<span class='notice'>You attempt to sacrifice [L] by invoking the sacrificial ritual.</span>")
+	to_chat(user, "<span class='notice'>Invoking the sacred ritual, you sacrifice [L].</span>")
 	L.gib()
 	message_admins("[ADMIN_LOOKUPFLW(user)] has sacrificed [key_name_admin(L)] on the sacrificial altar at [AREACOORD(src)].")
 

code/game/objects/structures/headpike.dm

@@ -13,15 +13,46 @@
 	icon_state = "headpike-bone"
 	bonespear = TRUE
 
+/obj/structure/headpike/Initialize(mapload)
+	. = ..()
+	if(mapload)
+		CheckParts()
+
 /obj/structure/headpike/CheckParts(list/parts_list)
 	..()
 	victim = locate(/obj/item/bodypart/head) in parts_list
-	name = "[victim.name] on a spear"
+	if(!victim) //likely a mapspawned one
+		victim = new(src)
+		victim.real_name = random_unique_name(prob(50))
+	name = "[victim.real_name] on a spear"
 	update_icon()
-	if(bonespear)
-		spear = locate(/obj/item/spear/bonespear) in parts_list
-	else
-		spear = locate(/obj/item/spear) in parts_list
+	spear = locate(bonespear ? /obj/item/spear/bonespear : /obj/item/spear) in parts_list
+	if(!spear)
+		spear = bonespear ? new/obj/item/spear/bonespear(src) : new/obj/item/spear(src)
+
+/obj/structure/headpike/Destroy()
+	QDEL_NULL(victim)
+	QDEL_NULL(spear)
+	return ..()
+
+/obj/structure/headpike/handle_atom_del(atom/A)
+	if(A == victim)
+		victim = null
+	if(A == spear)
+		spear = null
+	deconstruct(TRUE)
+	return ..()
+
+/obj/structure/headpike/deconstruct(disassembled)
+	if(!disassembled)
+		return ..()
+	if(victim)
+		victim.forceMove(drop_location())
+		victim = null
+	if(spear)
+		spear.forceMove(drop_location())
+		spear = null
+	return ..()
 
 /obj/structure/headpike/Initialize()
 	. = ..()
@@ -41,9 +72,4 @@
 	if(.)
 		return
 	to_chat(user, "<span class='notice'>You take down [src].</span>")
-	if(victim)
-		victim.forceMove(drop_location())
-		victim = null
-	spear.forceMove(drop_location())
-	spear = null
-	qdel(src)
+	deconstruct(TRUE)

code/game/objects/structures/ladders.dm

@@ -7,6 +7,7 @@
 	anchored = TRUE
 	var/obj/structure/ladder/down   //the ladder below this one
 	var/obj/structure/ladder/up     //the ladder above this one
+	obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN
 
 /obj/structure/ladder/Initialize(mapload, obj/structure/ladder/up, obj/structure/ladder/down)
 	..()

code/game/objects/structures/lattice.dm

@@ -17,6 +17,7 @@
 	/obj/structure/falsewall)
 	smooth = SMOOTH_MORE
 	//	flags = CONDUCT_1
+	obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN
 
 /obj/structure/lattice/examine(mob/user)
 	. = ..()
@@ -77,7 +78,7 @@
 	number_of_mats = 2
 	smooth = SMOOTH_TRUE
 	canSmoothWith = null
-	obj_flags = CAN_BE_HIT | BLOCK_Z_FALL
+	obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP
 
 /obj/structure/lattice/catwalk/deconstruction_hints(mob/user)
 	return "<span class='notice'>The supporting rods look like they could be <b>cut</b>.</span>"
@@ -103,7 +104,7 @@
 	color = "#5286b9ff"
 	smooth = SMOOTH_TRUE
 	canSmoothWith = null
-	obj_flags = CAN_BE_HIT | BLOCK_Z_FALL
+	obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP
 	resistance_flags = FIRE_PROOF | LAVA_PROOF
 
 /obj/structure/lattice/lava/deconstruction_hints(mob/user)

code/game/objects/structures/railings.dm

@@ -67,20 +67,21 @@
 	return TRUE
 
 /obj/structure/railing/CanPass(atom/movable/mover, turf/target)
-	..()
+	. = ..()
 	if(get_dir(loc, target) & dir)
-		var/checking = UNSTOPPABLE | FLYING | FLOATING
-		return !density || mover.movement_type & checking
+		var/checking = FLYING | FLOATING
+		return . || mover.movement_type & checking
 	return TRUE
 
 /obj/structure/railing/corner/CanPass()
 	..()
 	return TRUE
 
-/obj/structure/railing/CheckExit(atom/movable/O, turf/target)
+/obj/structure/railing/CheckExit(atom/movable/mover, turf/target)
 	..()
 	if(get_dir(loc, target) & dir)
-		return FALSE
+		var/checking = UNSTOPPABLE | FLYING | FLOATING
+		return !density || mover.movement_type & checking || mover.move_force >= MOVE_FORCE_EXTREMELY_STRONG
 	return TRUE
 
 /obj/structure/railing/corner/CheckExit()