Merge-conflict fix + check for null rather than type.

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

@@ -91,12 +91,11 @@
 
 /obj/structure/closet/secure_closet/emag_act(mob/user)
 	if(!broken)
-		broken = 1
-		locked = 0
-		desc = "It appears to be broken."
+		broken = TRUE
+		locked = FALSE
 		icon_state = icon_off
 		flick(icon_broken, src)
-		to_chat(user, "<span class='notice'>You unlock \the [src].</span>")
+		to_chat(user, "<span class='notice'>You break the lock on \the [src].</span>")
 
 /obj/structure/closet/secure_closet/attack_hand(mob/user)
 	add_fingerprint(user)

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

@@ -69,8 +69,8 @@
 			break
 		if(O.density || O.anchored || istype(O,/obj/structure/closet))
 			continue
-		if(istype(O, /obj/structure/stool/bed)) //This is only necessary because of rollerbeds and swivel chairs.
-			var/obj/structure/stool/bed/B = O
+		if(istype(O, /obj/structure/bed)) //This is only necessary because of rollerbeds and swivel chairs.
+			var/obj/structure/bed/B = O
 			if(B.buckled_mob)
 				continue
 		O.forceMove(src)

code/game/objects/structures/dresser.dm

@@ -21,33 +21,33 @@
 		switch(choice)
 			if("Underwear")
 				var/list/valid_underwear = list()
-				for(var/underwear in underwear_list)
-					var/datum/sprite_accessory/S = underwear_list[underwear]
+				for(var/underwear in GLOB.underwear_list)
+					var/datum/sprite_accessory/S = GLOB.underwear_list[underwear]
 					if(!(H.dna.species.name in S.species_allowed))
 						continue
-					valid_underwear[underwear] = underwear_list[underwear]
+					valid_underwear[underwear] = GLOB.underwear_list[underwear]
 				var/new_underwear = input(user, "Choose your underwear:", "Changing") as null|anything in valid_underwear
 				if(new_underwear)
 					H.underwear = new_underwear
 
 			if("Undershirt")
 				var/list/valid_undershirts = list()
-				for(var/undershirt in undershirt_list)
-					var/datum/sprite_accessory/S = undershirt_list[undershirt]
+				for(var/undershirt in GLOB.undershirt_list)
+					var/datum/sprite_accessory/S = GLOB.undershirt_list[undershirt]
 					if(!(H.dna.species.name in S.species_allowed))
 						continue
-					valid_undershirts[undershirt] = undershirt_list[undershirt]
+					valid_undershirts[undershirt] = GLOB.undershirt_list[undershirt]
 				var/new_undershirt = input(user, "Choose your undershirt:", "Changing") as null|anything in valid_undershirts
 				if(new_undershirt)
 					H.undershirt = new_undershirt
 
 			if("Socks")
 				var/list/valid_sockstyles = list()
-				for(var/sockstyle in socks_list)
-					var/datum/sprite_accessory/S = socks_list[sockstyle]
+				for(var/sockstyle in GLOB.socks_list)
+					var/datum/sprite_accessory/S = GLOB.socks_list[sockstyle]
 					if(!(H.dna.species.name in S.species_allowed))
 						continue
-					valid_sockstyles[sockstyle] = socks_list[sockstyle]
+					valid_sockstyles[sockstyle] = GLOB.socks_list[sockstyle]
 				var/new_socks = input(user, "Choose your socks:", "Changing")  as null|anything in valid_sockstyles
 				if(new_socks)
 					H.socks = new_socks

code/game/objects/structures/flora.dm

@@ -211,6 +211,7 @@
 	layer = 5
 	w_class = WEIGHT_CLASS_HUGE
 	force = 10
+	force_wielded = 10
 	throwforce = 13
 	throw_speed = 2
 	throw_range = 4
@@ -222,9 +223,10 @@
 		icon_state = "plant-36"
 
 /obj/item/twohanded/required/kirbyplants/equipped(mob/living/user)
+	. = ..()
 	var/image/I = image(icon = 'icons/obj/flora/plants.dmi' , icon_state = src.icon_state, loc = user)
 	I.override = 1
-	user.add_alt_appearance("sneaking_mission", I, player_list)
+	user.add_alt_appearance("sneaking_mission", I, GLOB.player_list)
 
 /obj/item/twohanded/required/kirbyplants/dropped(mob/living/user)
 	..()

code/game/objects/structures/janicart.dm

@@ -21,10 +21,10 @@
 /obj/structure/janitorialcart/New()
 	..()
 	create_reagents(100)
-	janitorial_equipment += src
+	GLOB.janitorial_equipment += src
 
 /obj/structure/janitorialcart/Destroy()
-	janitorial_equipment -= src
+	GLOB.janitorial_equipment -= src
 	QDEL_NULL(mybag)
 	QDEL_NULL(mymop)
 	QDEL_NULL(myspray)

code/game/objects/structures/mop_bucket.dm

@@ -10,14 +10,14 @@
 /obj/structure/mopbucket/New()
 	..()
 	create_reagents(100)
-	janitorial_equipment += src
+	GLOB.janitorial_equipment += src
 
 /obj/structure/mopbucket/full/New()
 	..()
 	reagents.add_reagent("water", 100)
 
 /obj/structure/mopbucket/Destroy()
-	janitorial_equipment -= src
+	GLOB.janitorial_equipment -= src
 	return ..()
 
 /obj/structure/mopbucket/examine(mob/user)

code/game/objects/structures/plasticflaps.dm

@@ -65,8 +65,8 @@
 	if(istype(A) && A.checkpass(PASSGLASS))
 		return prob(60)
 
-	var/obj/structure/stool/bed/B = A
-	if(istype(A, /obj/structure/stool/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass
+	var/obj/structure/bed/B = A
+	if(istype(A, /obj/structure/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass
 		return 0
 
 	if(istype(A, /obj/structure/closet/cardboard))
@@ -133,4 +133,4 @@
 	return ..()
 
 /obj/structure/plasticflaps/mining/CanAtmosPass(turf/T)
-	return 0
+	return 0