merge conflict fix, reset map

code/game/objects/effects/forcefields.dm

@@ -7,6 +7,12 @@
 	opacity = 0
 	density = 1
 	unacidable = 1
+	var/lifetime = 30 SECONDS
+
+/obj/effect/forcefield/New()
+	..()
+	if(lifetime)
+		QDEL_IN(src, lifetime)
 
 /obj/effect/forcefield/CanAtmosPass(turf/T)
 	return !density
@@ -29,12 +35,6 @@
 	icon_state = "empty"
 	name = "invisible wall"
 	desc = "You have a bad feeling about this."
-	var/lifetime = 30 SECONDS
-
-/obj/effect/forcefield/mime/New()
-	..()
-	if(lifetime)
-		QDEL_IN(src, lifetime)
 
 /obj/effect/forcefield/mime/advanced
 	name = "invisible blockade"

code/game/objects/effects/spawners/lootdrop.dm

@@ -98,6 +98,7 @@
 				/obj/item/poster/random_contraband = 10,
 				/obj/item/crowbar = 10,
 				/obj/item/crowbar/red = 10,
+				/obj/item/restraints/handcuffs/toy = 5,
 				/obj/item/extinguisher = 90,
 				//obj/item/gun/projectile/revolver/russian = 1, //disabled until lootdrop is a proper world proc.
 				/obj/item/hand_labeler = 10,
@@ -152,7 +153,8 @@
 				/obj/item/toy/cards/deck/syndicate = 2,
 				/obj/item/storage/secure/briefcase/syndie = 2,
 				/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 2,
-				"" = 70
+				/obj/item/storage/pill_bottle/fakedeath = 2,
+				"" = 68
 				)
 
 /obj/effect/spawner/lootdrop/crate_spawner // for ruins