Merge branch 'master' into Extermination

Signed-off-by: homexp13 <[email protected]>

_maps/last_stand.json

@@ -0,0 +1,6 @@
+{
+    "map_name": "Last Stand",
+    "map_path": "map_files/Last_Stand",
+    "map_file": "Last_Stand.dmm",
+    "announce_text": "A faint distress signal has been picked up by our scanners, which have tracked the source to Batallion 140's Supreme Command Center. Through use of emergency bluespace drive tech, the ship has jumped within range of the outpost. Senior officers are present and will need to be evacuated in order to completely finish your mission. TGMC, gear up and get ready to respond!"
+}

_maps/map_files/Campaign maps/orion_2/orionoutpost_2.dmm

@@ -20,7 +20,7 @@
 /area/orion_outpost/ground/underground/caveN)
 "ao" = (
 /obj/structure/flora/tree/joshua,
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /turf/open/floor/plating/ground/mars/random/cave/darker,
 /area/orion_outpost/ground/outpostcent)
 "ap" = (
@@ -2187,7 +2187,7 @@
 	},
 /area/orion_outpost/surface/building/administration)
 "kD" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 4
 	},
@@ -2620,7 +2620,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /turf/open/floor/mainship/mono,
 /area/orion_outpost/surface/building/vehicledepot)
 "mH" = (
@@ -4234,7 +4234,7 @@
 	},
 /area/orion_outpost/surface/building/prep)
 "tZ" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 1
 	},
@@ -4404,7 +4404,7 @@
 /turf/open/floor/mainship/mono,
 /area/orion_outpost/surface/building/atc)
 "uU" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 1
 	},
@@ -4567,15 +4567,15 @@
 /turf/open/floor/mainship/mono,
 /area/orion_outpost/surface/building/engineering)
 "vE" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete,
 /obj/structure/barricade/concrete{
 	dir = 4
 	},
 /turf/open/floor/plating/ground/mars/random/cave/darker,
 /area/orion_outpost/ground/outpostsw)
 "vF" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 4
 	},
@@ -4805,7 +4805,7 @@
 /turf/open/floor/plating/ground/mars/random/cave/darker,
 /area/orion_outpost/ground/outpostse)
 "wQ" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete,
 /turf/open/floor/plating/ground/mars/random/cave/darker,
 /area/orion_outpost/ground/outpostse)
@@ -5213,7 +5213,7 @@
 	},
 /area/orion_outpost/surface/building/engineering)
 "yK" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 4
 	},
@@ -5499,7 +5499,7 @@
 /area/orion_outpost/ground/underground/caveN/garbledradio)
 "Am" = (
 /obj/effect/turf_decal/riverdecal,
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 4
 	},
@@ -6550,7 +6550,7 @@
 /area/orion_outpost/surface/building/administration)
 "Fs" = (
 /obj/structure/flora/ausbushes/sparsegrass,
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete,
 /turf/open/floor/plating/ground/mars/random/cave/darker,
 /area/orion_outpost/ground/outposte)
@@ -7207,7 +7207,7 @@
 	},
 /area/orion_outpost/surface/building/vehicledepot)
 "IB" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 4
 	},
@@ -7400,7 +7400,7 @@
 /turf/open/floor/mainship/blue,
 /area/orion_outpost/surface/building/command)
 "JF" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /turf/open/floor/plating/ground/concrete,
 /area/orion_outpost/ground/outpostcent)
 "JG" = (
@@ -9172,7 +9172,7 @@
 /turf/closed/mineral/smooth/indestructible,
 /area/orion_outpost/ground/outpostw)
 "RR" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 8
 	},
@@ -9843,7 +9843,7 @@
 /turf/open/floor/plating/ground/concrete,
 /area/orion_outpost/surface/train_yard)
 "UY" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete,
 /turf/open/floor/plating/ground/mars/random/cave/darker,
 /area/orion_outpost/ground/outpostsw)
@@ -10448,7 +10448,7 @@
 /turf/open/floor/mainship/mono,
 /area/orion_outpost/surface/building/command)
 "XR" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 1
 	},