Fix merge conflicts

🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.

code/game/objects/items/bodybag.dm

@@ -82,12 +82,14 @@
 				qdel(src)
 			return
 
-/obj/structure/closet/bodybag/update_icon()
-	if(!opened)
-		icon_state = icon_closed
-	else
-		icon_state = icon_opened
+/obj/structure/closet/body_bag/relaymove(mob/user as mob)
+	if(user.stat)
+		return
 
+	// Make it possible to escape from bodybags in morgues and crematoriums
+	if(loc && (isturf(loc) || istype(loc, /obj/structure/morgue) || istype(loc, /obj/structure/crematorium)))
+		if(!open())
+			user << "<span class='notice'>It won't budge!</span>"
 
 /obj/item/bodybag/cryobag
 	name = "stasis bag"

code/game/objects/items/devices/PDA/cart.dm

@@ -28,7 +28,7 @@
 	var/datum/data/record/active1 = null //General
 	var/datum/data/record/active2 = null //Medical
 	var/datum/data/record/active3 = null //Security
-	var/obj/machinery/power/monitor/powmonitor = null // Power Monitor
+	var/obj/machinery/computer/monitor/powmonitor = null // Power Monitor
 	var/list/powermonitors = list()
 	var/message1	// used for status_displays
 	var/message2
@@ -196,18 +196,18 @@
 	access_reagent_scanner = 1
 	access_status_display = 1
 	access_atmos = 1
-	
+
 /obj/item/weapon/cartridge/captain/New()
 	..()
 	spawn(5)
 		radio = new /obj/item/radio/integrated/beepsky(src)
-		
+
 /obj/item/weapon/cartridge/supervisor
 	name = "Easy-Record DELUXE"
 	icon_state = "cart-h"
 	access_status_display = 1
 	access_security = 1
-	
+
 /obj/item/weapon/cartridge/centcom
 	name = "Value-PAK Cartridge"
 	desc = "Now with 200% more value!"
@@ -220,7 +220,7 @@
 	access_reagent_scanner = 1
 	access_status_display = 1
 	access_atmos = 1
-	
+
 /obj/item/weapon/cartridge/centcom/New()
 	..()
 	spawn(5)
@@ -294,7 +294,7 @@
 	/*		Power Monitor (Mode: 43 / 433)			*/
 	if(mode==43 || mode==433)
 		var/pMonData[0]
-		for(var/obj/machinery/power/monitor/pMon in world)
+		for(var/obj/machinery/computer/monitor/pMon in world)
 			if(!(pMon.stat & (NOPOWER|BROKEN)) )
 				pMonData[++pMonData.len] = list ("Name" = pMon.name, "ref" = "\ref[pMon]")
 				if(isnull(powmonitor)) powmonitor = pMon

code/game/objects/items/weapons/shards.dm

@@ -67,6 +67,8 @@
 
 			if( !H.shoes && ( !H.wear_suit || !(H.wear_suit.body_parts_covered & FEET) ) )
 				var/obj/item/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot"))
+				if(!affecting)
+					return
 				if(affecting.status & ORGAN_ROBOT)
 					return
 				H.Weaken(3)

code/game/objects/items/weapons/storage/bags.dm

@@ -241,7 +241,7 @@
 				usr.client.screen -= S
 			S.dropped(usr)
 			if(!S.amount)
-				del S
+				del(S)
 			else
 				S.loc = src
 
@@ -286,7 +286,7 @@
 				N.amount = stacksize
 				S.amount -= stacksize
 			if(!S.amount)
-				del S // todo: there's probably something missing here
+				del(S) // todo: there's probably something missing here
 		orient2hud(usr)
 		if(usr.s_active)
 			usr.s_active.show_to(usr)