Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins

code/game/objects/effects/biomass_rift.dm

@@ -6,6 +6,7 @@
 	density = 0
 	anchored = 1
 	layer = 20 //DEBUG
+	plane = HUD_PLANE //DEBUG
 	var/health = 10
 	var/stage = 1
 	var/obj/effect/rift/originalRift = null //the originating rift of that biomass

code/game/objects/effects/decals/misc.dm

@@ -12,6 +12,7 @@
 	density = 0
 	anchored = 1
 	layer = 50
+	plane = HUD_PLANE
 
 /obj/effect/decal/chempuff
 	name = "chemicals"

code/game/objects/effects/mines.dm

@@ -21,7 +21,7 @@
 
 	if(istype(M, /mob/living/carbon/human))
 		for(var/mob/O in viewers(world.view, src.loc))
-			to_chat(O, "<font color='red'>[M] triggered the \icon[src] [src]</font>")
+			to_chat(O, "<font color='red'>[M] triggered the [bicon(src)] [src]</font>")
 		triggered = 1
 		call(src,triggerproc)(M)
 

code/game/objects/effects/misc.dm

@@ -31,6 +31,7 @@
 		icon_state = "blank"
 		anchored = 1
 		layer = 99
+		plane = HUD_PLANE
 		mouse_opacity = 0
 		unacidable = 1//Just to be sure.
 

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

@@ -125,5 +125,43 @@
 
 	loot = list(
 				/obj/structure/closet/crate/secure/loot = 20,
-				"" = 80
+				"" = 80,
+				)
+
+/obj/effect/spawner/lootdrop/trade_sol_rare
+	name = "trader rare item spawner"
+	lootdoubles = 0
+	color = "#00FFFF"
+
+	loot = list(
+				/obj/item/weapon/card/emag_broken = 2,
+				/obj/item/weapon/defibrillator/compact/loaded = 2,
+				/obj/item/weapon/gun/energy/laser/retro = 2,
+				/obj/item/weapon/rcd/combat = 1,
+				/obj/item/weapon/rcd = 2,
+				)
+
+/obj/effect/spawner/lootdrop/trade_sol_common
+	name = "trader common item spawner"
+	lootdoubles = 0
+	color = "#00FFFF"
+
+	loot = list(
+				/obj/item/weapon/tank/anesthetic = 2,
+				/obj/item/weapon/weldingtool/hugetank = 2,
+				/obj/item/weapon/pickaxe/diamond = 1,
+				/obj/item/device/spacepod_equipment/weaponry/mining_laser = 1,
+				/obj/item/device/paicard = 2,
+				/obj/item/weapon/gun/projectile/automatic/pistol = 2,
+				/obj/item/device/megaphone = 2,
+				/obj/item/weapon/stock_parts/capacitor = 1,
+				/obj/item/weapon/stock_parts/cell/high = 1,
+				/obj/item/weapon/stock_parts/manipulator = 1,
+				/obj/item/weapon/stock_parts/matter_bin = 1,
+				/obj/item/weapon/stock_parts/micro_laser = 1,
+				/obj/item/weapon/stock_parts/scanning_module = 1,
+				/obj/item/weapon/spacecash/c200 = 1,
+				/obj/item/weapon/airlock_electronics = 1,
+				/obj/item/weapon/gun/energy/kinetic_accelerator/super = 1,
+				/obj/item/pizzabox = 3,
 				)