Merge remote-tracking branch 'upstream/master'

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm

@@ -25,8 +25,8 @@
 /obj/item/clothing/shoes/galoshes{
 	pixel_y = -5
 	},
-/obj/item/flashlight/eyelight{
-	pixel_y = 11
+/obj/item/flashlight{
+	pixel_y = 8
 	},
 /turf/open/floor/plating/icemoon,
 /area/ruin/plasma_facility/operations)

_maps/RandomRuins/SpaceRuins/infested_frigate.dmm

@@ -856,7 +856,7 @@
 	icon_state = "floor5-old"
 	},
 /obj/item/ammo_casing/spent,
-/obj/item/gun/ballistic/automatic/plastikov,
+/obj/item/gun/ballistic/automatic/smartgun,
 /obj/effect/mob_spawn/corpse/human/syndicatepilot,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/infested_frigate)
@@ -2790,7 +2790,7 @@
 	icon_state = "plastitaniumtiny"
 	},
 /mob/living/basic/alien/queen/large{
-	loot = list(/obj/effect/gibspawner/xeno,/obj/item/ammo_box/magazine/plastikov9mm,/obj/effect/mob_spawn/corpse/human/syndicatecommando/soft_suit);
+	loot = list(/obj/effect/gibspawner/xeno,/obj/item/ammo_box/magazine/smartgun,/obj/effect/mob_spawn/corpse/human/syndicatecommando/soft_suit);
 	desc = "What you saw in your dreams last night.";
 	faction = list("syndicate","xenomorph")
 	},

_maps/RandomZLevels/SnowCabin.dmm

@@ -598,7 +598,7 @@
 /turf/open/floor/iron/freezer,
 /area/awaymission/cabin)
 "cH" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowcabin,
 /obj/structure/cable,
 /turf/open/floor/wood,
 /area/awaymission/cabin)
@@ -660,7 +660,7 @@
 /turf/open/floor/iron/white,
 /area/awaymission/cabin)
 "cQ" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowcabin,
 /obj/structure/cable,
 /turf/open/floor/carpet,
 /area/awaymission/cabin)
@@ -2904,7 +2904,7 @@
 /area/awaymission/cabin/snowforest)
 "rk" = (
 /obj/machinery/light/directional/south,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowcabin,
 /obj/structure/sign/poster/official/report_crimes/directional/south,
 /obj/structure/cable,
 /turf/open/floor/carpet,

_maps/RandomZLevels/TheBeach.dmm

@@ -1688,7 +1688,7 @@
 "vq" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/broken_floor,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/beach,
 /turf/open/floor/plating,
 /area/awaymission/beach)
 "vx" = (
@@ -3586,7 +3586,7 @@
 /area/awaymission/beach)
 "SB" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/beach,
 /turf/open/floor/plating,
 /area/awaymission/beach)
 "SI" = (

_maps/RandomZLevels/caves.dmm

@@ -480,7 +480,7 @@
 /turf/open/floor/plating,
 /area/awaymission/caves/research)
 "cR" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/caves,
 /turf/open/floor/plating,
 /area/awaymission/caves/research)
 "cS" = (
@@ -610,7 +610,7 @@
 "dw" = (
 /obj/structure/bed,
 /obj/item/bedsheet,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/caves,
 /turf/open/floor/iron,
 /area/awaymission/caves/bmp_asteroid/level_two)
 "dx" = (
@@ -653,7 +653,7 @@
 "dH" = (
 /obj/structure/bed,
 /obj/item/bedsheet,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/caves,
 /turf/open/floor/wood,
 /area/awaymission/caves/northblock)
 "dI" = (
@@ -705,7 +705,7 @@
 /obj/structure/bed,
 /obj/item/bedsheet,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/caves,
 /turf/open/floor/wood,
 /area/awaymission/caves/northblock)
 "ea" = (
@@ -714,7 +714,7 @@
 /area/awaymission/caves/northblock)
 "ed" = (
 /obj/structure/bed,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/caves,
 /turf/open/floor/wood,
 /area/awaymission/caves/northblock)
 "ee" = (
@@ -849,7 +849,7 @@
 /turf/open/floor/iron,
 /area/awaymission/caves/listeningpost)
 "eO" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/caves,
 /turf/open/floor/iron,
 /area/awaymission/caves/listeningpost)
 "eP" = (
@@ -1584,7 +1584,7 @@
 	},
 /area/awaymission/caves/bmp_asteroid/level_two)
 "Bs" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/caves,
 /turf/open/misc/asteroid/basalt{
 	initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
 	},

_maps/RandomZLevels/moonoutpost19.dmm

@@ -1903,14 +1903,14 @@
 /turf/open/floor/mineral/titanium/yellow,
 /area/awaymission/moonoutpost19/arrivals)
 "ms" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/moonoutpost,
 /turf/open/floor/mineral/titanium/blue,
 /area/awaymission/moonoutpost19/arrivals)
 "mt" = (
 /obj/structure/chair{
 	dir = 8
 	},
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/moonoutpost,
 /turf/open/floor/mineral/titanium/blue,
 /area/awaymission/moonoutpost19/arrivals)
 "mu" = (
@@ -1955,7 +1955,7 @@
 /turf/open/floor/mineral/titanium/yellow,
 /area/awaymission/moonoutpost19/arrivals)
 "mI" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/moonoutpost,
 /turf/open/floor/mineral/titanium/yellow,
 /area/awaymission/moonoutpost19/arrivals)
 "mJ" = (
@@ -1965,7 +1965,7 @@
 	icon_state = "beacon";
 	name = "tracking beacon"
 	},
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/moonoutpost,
 /turf/open/floor/mineral/titanium/yellow,
 /area/awaymission/moonoutpost19/arrivals)
 "mK" = (

_maps/RandomZLevels/museum.dmm

@@ -1426,7 +1426,7 @@
 /turf/open/indestructible/plating,
 /area/awaymission/museum)
 "lz" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/museum,
 /obj/structure/flora/bush/sparsegrass/style_random,
 /turf/open/floor/grass,
 /area/awaymission/museum)
@@ -3095,7 +3095,7 @@
 /turf/open/floor/iron/smooth_large,
 /area/awaymission/museum)
 "zd" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/museum,
 /turf/open/floor/grass,
 /area/awaymission/museum)
 "zg" = (
@@ -4503,7 +4503,7 @@
 	},
 /area/awaymission/museum)
 "KN" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/museum,
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},

_maps/RandomZLevels/research.dmm

@@ -389,7 +389,7 @@
 /turf/open/floor/iron/dark,
 /area/awaymission/research/interior/gateway)
 "bR" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/research,
 /turf/open/floor/iron/dark,
 /area/awaymission/research/interior/gateway)
 "bS" = (
@@ -438,7 +438,7 @@
 /turf/open/floor/iron/dark,
 /area/awaymission/research/interior/gateway)
 "bZ" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/research,
 /obj/effect/turf_decal/stripes/line,
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
@@ -481,12 +481,12 @@
 /area/awaymission/research/interior/gateway)
 "cj" = (
 /obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/research,
 /turf/open/floor/iron/dark,
 /area/awaymission/research/interior/gateway)
 "ck" = (
 /obj/machinery/door/window/right/directional/south,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/research,
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/awaymission/research/interior/gateway)
@@ -1761,7 +1761,7 @@
 /obj/structure/toilet{
 	dir = 8
 	},
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/research,
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/iron/freezer,
 /area/awaymission/research/interior/bathroom)
@@ -2007,7 +2007,7 @@
 "jU" = (
 /obj/structure/bed,
 /obj/item/bedsheet/blue,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/research,
 /turf/open/floor/wood,
 /area/awaymission/research/interior/dorm)
 "jV" = (
@@ -2505,7 +2505,7 @@
 "lT" = (
 /obj/structure/bed,
 /obj/item/bedsheet/patriot,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/research,
 /turf/open/floor/wood,
 /area/awaymission/research/interior/dorm)
 "lX" = (
@@ -2976,7 +2976,7 @@
 /area/awaymission/research/interior)
 "sM" = (
 /obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/research,
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/awaymission/research/interior/gateway)