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

code/modules/awaymissions/corpse.dm

@@ -162,7 +162,7 @@
 	corpseradio = /obj/item/device/radio/headset/headset_eng
 	corpseuniform = /obj/item/clothing/under/rank/engineer
 	corpseback = /obj/item/weapon/storage/backpack/industrial
-	corpseshoes = /obj/item/clothing/shoes/orange
+	corpseshoes = /obj/item/clothing/shoes/workboots
 	corpsebelt = /obj/item/weapon/storage/belt/utility/full
 	corpsegloves = /obj/item/clothing/gloves/color/yellow
 	corpsehelmet = /obj/item/clothing/head/hardhat

code/modules/awaymissions/gateway.dm

@@ -149,7 +149,7 @@ obj/machinery/gateway/centerstation/process()
 
 /obj/machinery/gateway/centerstation/attackby(obj/item/device/W as obj, mob/user as mob, params)
 	if(istype(W,/obj/item/device/multitool))
-		to_chat(user, "\black The gate is already calibrated, there is no work for you to do here.")
+		to_chat(user, "The gate is already calibrated, there is no work for you to do here.")
 		return
 
 /////////////////////////////////////Away////////////////////////

code/modules/awaymissions/map_rng.dm

@@ -0,0 +1,38 @@
+/obj/effect/landmark/map_loader
+	name = "map loader"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "x2"
+	invisibility = 101
+	anchored = 1
+	density = 0
+	opacity = 0
+	var/template_name = null
+	var/datum/map_template/template = null
+	var/centered = 1
+
+/obj/effect/landmark/map_loader/New(loc, tname)
+	..()
+	if(tname)
+		template_name = tname
+	if(template_name)
+		template = map_templates[template_name]
+	if(template)
+		load(template)
+
+/obj/effect/landmark/map_loader/proc/load(datum/map_template/t)
+	spawn(1)
+		if(!t)
+			return
+		t.load(get_turf(src), centered = centered)
+		t.loaded++
+		qdel(src)
+
+/obj/effect/landmark/map_loader/random
+	var/template_list = ""
+
+/obj/effect/landmark/map_loader/random/New()
+	..()
+	if(template_list)
+		template_name = safepick(splittext(template_list, ";"))
+		template = map_templates[template_name]
+		load(template)

code/modules/awaymissions/mission_code/stationCollision.dm

@@ -61,10 +61,8 @@
  */
 //Captain's retro laser - Fires practice laser shots instead.
 obj/item/weapon/gun/energy/laser/retro/sc_retro
-	name ="retro laser"
-	icon_state = "retro"
 	desc = "An older model of the basic lasergun, no longer used by Nanotrasen's security or military forces."
-//	projectile_type = "/obj/item/projectile/practice"
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/practice)
 	clumsy_check = 0 //No sense in having a harmless gun blow up in the clowns face
 
 //Syndicate sub-machine guns.
@@ -196,4 +194,4 @@ var/sc_safecode5 = "[rand(0,9)]"
 	return
 
 /obj/singularity/narsie/sc_Narsie/ex_act()
-	return
+	return

code/modules/awaymissions/mission_code/wildwest.dm

@@ -172,7 +172,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)