Merge branch 'master' of https://github.com/tgstation/TerraGov-Marine…

…-Corps

_maps/gelida_iv.json

@@ -12,7 +12,7 @@
 		"set4": 2
 	},
     "armor": "ice",
-	"quickbuilds": 1600,
+	"quickbuilds": 1900,
 	"announce_text": "Our comms array has detected an automated emergency signal broadcasting over a frequency reserved for the highest level of emergencies. The message was traced to the northern reaches of the research colony Gelida IV. The ship is moving into the sector with thrusters at max throttle. TGMC, get briefed and then move out!",
 	"traits":[{
 		"weather_snowstorm": true

_maps/interiors/apc_medical.dmm

@@ -54,6 +54,7 @@
 /turf/open/interior/apc/nine,
 /area/interior/apc)
 "B" = (
+/obj/machinery/telecomms/relay/preset/telecomms/onboard/nondense,
 /turf/closed/interior/apc/six,
 /area/interior/apc)
 "C" = (
@@ -107,6 +108,13 @@
 "Y" = (
 /turf/closed/interior/apc/one,
 /area/interior/apc)
+"Z" = (
+/obj/structure/bed/chair/loader_seat{
+	pixel_y = -5
+	},
+/obj/structure/periscope/apc,
+/turf/open/interior/apc/twentynine,
+/area/interior/apc)
 
 (1,1,1) = {"
 Y
@@ -147,7 +155,7 @@ l
 H
 t
 D
-O
+Z
 l
 "}
 (7,1,1) = {"

_maps/interiors/apc_transport.dmm

@@ -15,6 +15,7 @@
 /turf/closed/interior/apc/twentyfour,
 /area/interior/apc)
 "g" = (
+/obj/machinery/telecomms/relay/preset/telecomms/onboard/nondense,
 /turf/closed/interior/apc/six,
 /area/interior/apc)
 "j" = (
@@ -23,6 +24,13 @@
 "l" = (
 /turf/closed/interior/apc/five,
 /area/interior/apc)
+"m" = (
+/obj/structure/periscope/apc,
+/obj/structure/bed/chair/loader_seat{
+	pixel_y = -5
+	},
+/turf/open/interior/apc/nine,
+/area/interior/apc)
 "n" = (
 /obj/structure/bed/chair/dropship/doublewide/left,
 /obj/structure/bed/chair/dropship/doublewide/right,
@@ -39,6 +47,13 @@
 /obj/structure/bed/chair/dropship/doublewide/right,
 /turf/open/interior/apc/nine,
 /area/interior/apc)
+"s" = (
+/obj/structure/periscope/apc,
+/obj/structure/bed/chair/loader_seat{
+	pixel_y = -5
+	},
+/turf/open/interior/apc/twentynine,
+/area/interior/apc)
 "u" = (
 /obj/structure/gun_breech/secondary,
 /turf/open/interior/apc/twentytwo,
@@ -129,9 +144,9 @@ x
 "}
 (6,1,1) = {"
 b
-r
+m
 T
-J
+s
 x
 "}
 (7,1,1) = {"

_maps/map_files/Arachne/TGS_Arachne.dmm

@@ -14304,6 +14304,7 @@
 /obj/item/target/syndicate,
 /obj/machinery/power/apc/mainship,
 /obj/structure/cable,
+/obj/item/shotgunbox/blank,
 /turf/open/floor/mainship/red{
 	dir = 5
 	},
@@ -26578,9 +26579,9 @@
 	dir = 1
 	},
 /obj/machinery/door_control/mainship/ammo{
+	dir = 4;
 	id = "ammo1";
-	name = "Dropship Armament Storage";
-	dir = 4
+	name = "Dropship Armament Storage"
 	},
 /turf/open/floor/mainship/black{
 	dir = 8

_maps/map_files/Campaign maps/nt_base/nt_base.dmm

@@ -3579,7 +3579,7 @@
 /obj/structure/table/reinforced/prison,
 /obj/item/reagent_containers/jerrycan{
 	desc = "A jerry can. In space! Or maybe a colony.";
-	item_state = "caution";
+	worn_icon_state = "caution";
 	name = "fuel can";
 	pixel_y = 10
 	},
@@ -3588,7 +3588,7 @@
 	},
 /obj/item/reagent_containers/jerrycan{
 	desc = "A jerry can. In space! Or maybe a colony.";
-	item_state = "caution";
+	worn_icon_state = "caution";
 	name = "fuel can";
 	pixel_x = 2;
 	pixel_y = 3
@@ -19850,7 +19850,7 @@
 "oEb" = (
 /obj/item/reagent_containers/jerrycan{
 	desc = "A jerry can. In space! Or maybe a colony.";
-	item_state = "caution";
+	worn_icon_state = "caution";
 	name = "fuel can";
 	pixel_x = 4;
 	pixel_y = 16
@@ -31463,7 +31463,7 @@
 /obj/structure/rack/nometal,
 /obj/effect/spawner/random/misc/earmuffs,
 /obj/item/clothing/ears/earmuffs{
-	item_state = "earmuffs2";
+	worn_icon_state = "earmuffs2";
 	pixel_y = -4
 	},
 /turf/open/floor/plating/ground/snow/layer2,

_maps/map_files/DaedalusPrison/DaedalusPrison.dmm

@@ -987,6 +987,11 @@
 	dir = 4
 	},
 /area/daedalusprison/inside/southmeetingroom)
+"aOv" = (
+/obj/machinery/computer/shuttle/shuttle_control/dropship,
+/obj/structure/table/mainship,
+/turf/open/floor/plating/ground/snow/layer0,
+/area/lv624/lazarus/console)
 "aOR" = (
 /obj/effect/decal/cleanable/blood,
 /obj/machinery/air_alarm{
@@ -73255,7 +73260,7 @@ gfH
 mYW
 gfH
 gfH
-gfH
+aOv
 gfH
 gfH
 gfH