Merge pull request #3668 from VOREStation/polaris-sync-2018-05-01

Polaris Sync 2018-05-01

code/game/objects/structures/curtains.dm

@@ -2,13 +2,15 @@
 	name = "curtain"
 	icon = 'icons/obj/curtain.dmi'
 	icon_state = "closed"
-	layer = SHOWER_OPEN_LAYER
+	plane = MOB_PLANE
+	layer = ABOVE_MOB_LAYER
 	opacity = 1
 	density = 0
 
 /obj/structure/curtain/open
 	icon_state = "open"
-	layer = SHOWER_CLOSED_LAYER
+	plane = OBJ_PLANE
+	layer = OBJ_LAYER
 	opacity = 0
 
 /obj/structure/curtain/bullet_act(obj/item/projectile/P, def_zone)
@@ -27,10 +29,12 @@
 	set_opacity(!opacity)
 	if(opacity)
 		icon_state = "closed"
-		layer = SHOWER_CLOSED_LAYER
+		plane = MOB_PLANE
+		layer = ABOVE_MOB_LAYER
 	else
 		icon_state = "open"
-		layer = SHOWER_OPEN_LAYER
+		plane = OBJ_PLANE
+		layer = OBJ_LAYER
 
 /obj/structure/curtain/attackby(obj/item/P, mob/user)
 	if(istype(P, /obj/item/weapon/wirecutters))
@@ -76,6 +80,3 @@
 
 /obj/structure/curtain/open/shower/security
 	color = "#AA0000"
-
-#undef SHOWER_OPEN_LAYER
-#undef SHOWER_CLOSED_LAYER

code/game/objects/structures/loot_piles.dm

@@ -830,3 +830,42 @@ Loot piles can be depleted, if loot_depleted is turned on.  Note that players wh
 		/obj/item/mecha_parts/mecha_equipment/repair_droid,
 		/obj/item/mecha_parts/mecha_equipment/teleporter
 		)
+
+/obj/structure/loot_pile/surface/drone
+	name = "drone wreckage"
+	desc = "The ruins of some unfortunate drone. Perhaps something is salvageable."
+	icon = 'icons/mob/animal.dmi'
+	icon_state = "drone_dead"
+
+// Since the actual drone loot is a bit stupid in how it is handled, this is a sparse and empty list with items I don't exactly want in it. But until we can get the proper items in . . .
+
+	common_loot = list(
+		/obj/random/tool,
+		/obj/item/stack/cable_coil/random,
+		/obj/random/tank,
+		/obj/random/tech_supply/component,
+		/obj/item/stack/material/steel{amount = 25},
+		/obj/item/stack/material/glass{amount = 10},
+		/obj/item/stack/material/plasteel{amount = 5},
+		/obj/item/weapon/cell,
+		/obj/item/weapon/material/shard
+		)
+
+	uncommon_loot = list(
+		/obj/item/weapon/cell/high,
+		/obj/item/robot_parts/robot_component/actuator,
+		/obj/item/robot_parts/robot_component/armour,
+		/obj/item/robot_parts/robot_component/binary_communication_device,
+		/obj/item/robot_parts/robot_component/camera,
+		/obj/item/robot_parts/robot_component/diagnosis_unit,
+		/obj/item/robot_parts/robot_component/radio
+		)
+
+	rare_loot = list(
+		/obj/item/weapon/cell/super,
+		/obj/item/borg/upgrade/restart,
+		/obj/item/borg/upgrade/jetpack,
+		/obj/item/borg/upgrade/tasercooler,
+		/obj/item/borg/upgrade/syndicate,
+		/obj/item/borg/upgrade/vtec
+		)

code/game/objects/structures/watercloset.dm

@@ -142,7 +142,8 @@
 	name = "mist"
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "mist"
-	layer = MOB_LAYER + 1
+	plane = MOB_PLANE
+	layer = ABOVE_MOB_LAYER
 	anchored = 1
 	mouse_opacity = 0