Merge remote-tracking branch 'upstream/master' into scarborgh

_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm

@@ -250,21 +250,6 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/powered)
-"ga" = (
-/obj/structure/table/wood/reinforced,
-/obj/item/gun/ballistic/automatic/toy{
-	pixel_x = 5;
-	pixel_y = 7
-	},
-/obj/item/ammo_box/foambox/riot{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/grimy,
-/area/ruin/powered)
 "gp" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -1871,6 +1856,21 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
+"RC" = (
+/obj/structure/table/wood/reinforced,
+/obj/item/gun/ballistic/automatic/toy{
+	pixel_x = 5;
+	pixel_y = 7
+	},
+/obj/item/ammo_box/foambox/riot{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/grimy,
+/area/ruin/powered)
 "RM" = (
 /obj/effect/spawner/structure/window/hollow/reinforced,
 /turf/open/floor/plating,
@@ -2968,7 +2968,7 @@ RU
 bO
 cv
 oc
-ga
+RC
 Tl
 ko
 kU
@@ -3367,7 +3367,7 @@ of
 IA
 ro
 ro
-hJ
+bf
 Ew
 LT
 hi
@@ -3446,7 +3446,7 @@ je
 kC
 nq
 qm
-hJ
+bf
 tw
 tC
 vK

_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm

@@ -243,7 +243,7 @@
 	},
 /obj/effect/turf_decal/siding/wood,
 /obj/structure/chair/stool/bar,
-/mob/living/simple_animal/hostile/human/hermit/survivor,
+/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger,
 /turf/open/floor/wood,
 /area/ruin/whitesands/saloon)
 "gC" = (
@@ -445,7 +445,6 @@
 "lI" = (
 /obj/structure/table/wood/poker,
 /obj/effect/spawner/lootdrop/gambling,
-/obj/item/spacecash/bundle/loadsamoney,
 /turf/open/floor/carpet,
 /area/ruin/whitesands/saloon)
 "lV" = (
@@ -890,6 +889,9 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/hostile/human/hermit/survivor{
+	dir = 4
+	},
 /turf/open/floor/wood{
 	icon_state = "wood-broken5"
 	},
@@ -1029,7 +1031,8 @@
 	icon_state = "pulse_carbine";
 	name = "pulse rifle";
 	desc = "A supposedly heavy-duty, multifaceted energy rifle. The barrel looks off and the casing seems to be made of plastic";
-	item_state = "pulse"
+	item_state = "pulse";
+	icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
 	},
 /turf/open/floor/wood,
 /area/ruin/whitesands/saloon)
@@ -1114,7 +1117,7 @@
 /obj/structure/chair/stool/bar{
 	dir = 8
 	},
-/mob/living/simple_animal/hostile/human/hermit/survivor{
+/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger{
 	dir = 8
 	},
 /turf/open/floor/wood,
@@ -1497,7 +1500,7 @@
 /area/ruin/whitesands/saloon)
 "Ua" = (
 /obj/structure/chair/stool/bar,
-/mob/living/simple_animal/hostile/human/hermit/survivor{
+/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger{
 	dir = 8
 	},
 /turf/open/floor/wood{
@@ -1672,6 +1675,7 @@
 	pixel_y = 6;
 	pixel_x = 3
 	},
+/obj/item/spacecash/bundle/loadsamoney,
 /turf/open/floor/carpet,
 /area/ruin/whitesands/saloon)
 "ZG" = (

_maps/shuttles/independent/independent_mudskipper.dmm

@@ -349,6 +349,7 @@
 /obj/item/circular_saw,
 /obj/item/multitool,
 /obj/item/stack/marker_beacon/thirty,
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "gT" = (

_maps/shuttles/independent/independent_rigger.dmm

@@ -4468,6 +4468,7 @@
 /obj/item/storage/toolbox/mechanical,
 /obj/item/storage/belt/utility,
 /obj/item/clothing/glasses/welding,
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plating,
 /area/ship/engineering)
 

_maps/shuttles/independent/independent_shetland.dmm

@@ -4725,6 +4725,8 @@
 /obj/item/multitool,
 /obj/item/clothing/glasses/welding,
 /obj/item/clothing/glasses/welding,
+/obj/item/gun/energy/plasmacutter,
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/electrical)
 "OU" = (