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

…-Corps
Xander3359 · Apr 21, 2024 · 78302d8 · 78302d8
2 parents 89ad8c6 + 1cd17c0
commit 78302d8
Show file tree

Hide file tree

Showing 226 changed files with 10,391 additions and 6,078 deletions.
diff --git a/_maps/bigred_v2.json b/_maps/bigred_v2.json
@@ -6,6 +6,7 @@
 		"basic": 1
 	},
 	"quickbuilds": 2300,
+	"armor": "desert",
 	"announce_text": "A second generation colony has had a beacon transmitting the same signal, nonstop. Attempts to hail the colony over comms have proved futile. Because the ship was at a nearby drydock, it has been dispatched to figure out what's wrong. TGMC, prepare to deploy!",
 	"traits":[{
 		"weather_sandstorm": true

diff --git a/_maps/interiors/apc_medical.dmm b/_maps/interiors/apc_medical.dmm
@@ -0,0 +1,173 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/interior/apc/nineteen,
+/area/interior/apc)
+"b" = (
+/obj/structure/bed/chair/driver_gunner_seat{
+	pixel_x = -3;
+	pixel_y = -5
+	},
+/turf/open/interior/apc/eleven,
+/area/interior/apc)
+"c" = (
+/turf/open/interior/apc/nine,
+/area/interior/apc)
+"d" = (
+/turf/closed/interior/apc/twenty,
+/area/interior/apc)
+"e" = (
+/turf/closed/interior/apc/two,
+/area/interior/apc)
+"g" = (
+/turf/closed/interior/apc/five,
+/area/interior/apc)
+"h" = (
+/turf/closed/interior/apc/twelve,
+/area/interior/apc)
+"k" = (
+/obj/machinery/optable,
+/obj/item/tank/anesthetic,
+/turf/open/interior/apc/twentynine,
+/area/interior/apc)
+"l" = (
+/turf/closed/interior/apc/twentyseven,
+/area/interior/apc)
+"m" = (
+/obj/structure/gun_breech/secondary,
+/turf/open/interior/apc/twentytwo,
+/area/interior/apc)
+"n" = (
+/turf/open/interior/apc/ten,
+/area/interior/apc)
+"o" = (
+/turf/open/interior/apc/sixteen,
+/area/interior/apc)
+"p" = (
+/turf/closed/interior/apc/thirteen,
+/area/interior/apc)
+"s" = (
+/turf/open/interior/apc/eight,
+/area/interior/apc)
+"t" = (
+/obj/structure/bed/chair/dropship/doublewide/left,
+/obj/structure/bed/chair/dropship/doublewide/right,
+/turf/open/interior/apc/nine,
+/area/interior/apc)
+"B" = (
+/turf/closed/interior/apc/six,
+/area/interior/apc)
+"C" = (
+/turf/closed/interior/tank/door,
+/area/interior/apc)
+"D" = (
+/turf/open/interior/apc/fifteen,
+/area/interior/apc)
+"F" = (
+/obj/machinery/vending/MarineMed,
+/turf/open/interior/apc/twentynine,
+/area/interior/apc)
+"H" = (
+/turf/closed/interior/apc/four,
+/area/interior/apc)
+"I" = (
+/turf/closed/interior/apc/twentythree,
+/area/interior/apc)
+"J" = (
+/turf/open/interior/apc/fourteen,
+/area/interior/apc)
+"L" = (
+/turf/closed/interior/apc/twentyeight,
+/area/interior/apc)
+"O" = (
+/obj/structure/bed/chair/dropship/doublewide/left,
+/obj/structure/bed/chair/dropship/doublewide/right,
+/turf/open/interior/apc/twentynine,
+/area/interior/apc)
+"P" = (
+/turf/closed/interior/apc/twentyfour,
+/area/interior/apc)
+"S" = (
+/turf/closed/interior/apc/seventeen,
+/area/interior/apc)
+"T" = (
+/obj/structure/bed/chair/comfy{
+	dir = 8
+	},
+/turf/open/interior/apc/twentynine,
+/area/interior/apc)
+"U" = (
+/turf/closed/interior/apc/three,
+/area/interior/apc)
+"W" = (
+/obj/structure/ammo_rack/secondary{
+	pixel_y = -13
+	},
+/turf/closed/interior/apc/two,
+/area/interior/apc)
+"Y" = (
+/turf/closed/interior/apc/one,
+/area/interior/apc)
+
+(1,1,1) = {"
+Y
+C
+p
+p
+a
+"}
+(2,1,1) = {"
+e
+s
+J
+F
+l
+"}
+(3,1,1) = {"
+e
+c
+D
+k
+l
+"}
+(4,1,1) = {"
+e
+t
+D
+T
+l
+"}
+(5,1,1) = {"
+U
+t
+D
+O
+l
+"}
+(6,1,1) = {"
+H
+t
+D
+O
+l
+"}
+(7,1,1) = {"
+W
+n
+o
+m
+l
+"}
+(8,1,1) = {"
+g
+b
+S
+I
+d
+"}
+(9,1,1) = {"
+B
+h
+P
+P
+L
+"}
diff --git a/_maps/interiors/apc_transport.dmm b/_maps/interiors/apc_transport.dmm
@@ -0,0 +1,157 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/interior/apc/nineteen,
+/area/interior/apc)
+"b" = (
+/turf/closed/interior/apc/four,
+/area/interior/apc)
+"c" = (
+/obj/structure/ammo_rack/secondary{
+	pixel_y = -13
+	},
+/turf/closed/interior/apc/two,
+/area/interior/apc)
+"f" = (
+/turf/closed/interior/apc/twentyfour,
+/area/interior/apc)
+"g" = (
+/turf/closed/interior/apc/six,
+/area/interior/apc)
+"j" = (
+/turf/closed/interior/apc/twentythree,
+/area/interior/apc)
+"l" = (
+/turf/closed/interior/apc/five,
+/area/interior/apc)
+"n" = (
+/obj/structure/bed/chair/dropship/doublewide/left,
+/obj/structure/bed/chair/dropship/doublewide/right,
+/turf/open/interior/apc/eight,
+/area/interior/apc)
+"p" = (
+/turf/closed/interior/apc/twelve,
+/area/interior/apc)
+"q" = (
+/turf/closed/interior/apc/three,
+/area/interior/apc)
+"r" = (
+/obj/structure/bed/chair/dropship/doublewide/left,
+/obj/structure/bed/chair/dropship/doublewide/right,
+/turf/open/interior/apc/nine,
+/area/interior/apc)
+"u" = (
+/obj/structure/gun_breech/secondary,
+/turf/open/interior/apc/twentytwo,
+/area/interior/apc)
+"x" = (
+/turf/closed/interior/apc/twentyseven,
+/area/interior/apc)
+"y" = (
+/turf/closed/interior/apc/two,
+/area/interior/apc)
+"z" = (
+/turf/closed/interior/tank/door,
+/area/interior/apc)
+"B" = (
+/turf/closed/interior/apc/one,
+/area/interior/apc)
+"C" = (
+/obj/structure/bed/chair/driver_gunner_seat{
+	pixel_x = -3;
+	pixel_y = -5
+	},
+/turf/open/interior/apc/eleven,
+/area/interior/apc)
+"E" = (
+/turf/open/interior/apc/fourteen,
+/area/interior/apc)
+"F" = (
+/turf/closed/interior/apc/thirteen,
+/area/interior/apc)
+"G" = (
+/turf/closed/interior/apc/twentyeight,
+/area/interior/apc)
+"I" = (
+/turf/open/interior/apc/sixteen,
+/area/interior/apc)
+"J" = (
+/obj/structure/bed/chair/dropship/doublewide/left,
+/obj/structure/bed/chair/dropship/doublewide/right,
+/turf/open/interior/apc/twentynine,
+/area/interior/apc)
+"L" = (
+/turf/closed/interior/apc/seventeen,
+/area/interior/apc)
+"M" = (
+/turf/open/interior/apc/ten,
+/area/interior/apc)
+"R" = (
+/turf/closed/interior/apc/twenty,
+/area/interior/apc)
+"T" = (
+/turf/open/interior/apc/fifteen,
+/area/interior/apc)
+
+(1,1,1) = {"
+B
+F
+z
+F
+a
+"}
+(2,1,1) = {"
+y
+n
+E
+J
+x
+"}
+(3,1,1) = {"
+y
+r
+T
+J
+x
+"}
+(4,1,1) = {"
+y
+r
+T
+J
+x
+"}
+(5,1,1) = {"
+q
+r
+T
+J
+x
+"}
+(6,1,1) = {"
+b
+r
+T
+J
+x
+"}
+(7,1,1) = {"
+c
+M
+I
+u
+x
+"}
+(8,1,1) = {"
+l
+C
+L
+j
+R
+"}
+(9,1,1) = {"
+g
+p
+f
+f
+G
+"}
diff --git a/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm b/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm
@@ -2675,7 +2675,7 @@
 /area/campaign/jungle_outpost/ground/jungle/west)
 "nv" = (
 /obj/structure/closet/cabinet,
-/obj/item/weapon/claymore/mercsword/machete/alt,
+/obj/item/weapon/sword/machete/alt,
 /obj/item/weapon/karambit/fade,
 /turf/open/floor/wood/variable/wide,
 /area/campaign/jungle_outpost/outpost/outer/hermit)

diff --git a/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
@@ -14644,7 +14644,7 @@
 "bKg" = (
 /obj/structure/safe,
 /obj/item/reagent_containers/food/drinks/bottle/absinthe,
-/obj/item/weapon/katana,
+/obj/item/weapon/sword/katana,
 /turf/open/floor/tile/dark/blue2{
 	dir = 1
 	},

diff --git a/_maps/map_files/Iteron/Iteron.dmm b/_maps/map_files/Iteron/Iteron.dmm
@@ -2494,11 +2494,11 @@
 /obj/item/tool/crowbar/red,
 /obj/item/tool/crowbar/red,
 /obj/item/tool/crowbar/red,
-/obj/item/weapon/claymore/mercsword/machete,
-/obj/item/weapon/claymore/mercsword/machete,
-/obj/item/weapon/claymore/mercsword/machete,
-/obj/item/weapon/claymore/mercsword/machete,
-/obj/item/weapon/claymore/mercsword/machete,
+/obj/item/weapon/sword/machete,
+/obj/item/weapon/sword/machete,
+/obj/item/weapon/sword/machete,
+/obj/item/weapon/sword/machete,
+/obj/item/weapon/sword/machete,
 /turf/open/floor/prison/bright_clean,
 /area/mainship/patrol_base/hanger)
 "HJ" = (