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

…-Corps
Xander3359 · Jan 14, 2024 · a72e571 · a72e571
2 parents 07f11d6 + 8966feb
commit a72e571
Show file tree

Hide file tree

Showing 392 changed files with 5,172 additions and 5,478 deletions.
diff --git a/_maps/map_files/Arachne/TGS_Arachne.dmm b/_maps/map_files/Arachne/TGS_Arachne.dmm
@@ -7040,6 +7040,7 @@
 /area/mainship/medical/lounge)
 "fZU" = (
 /obj/machinery/light/mainship,
+/obj/structure/dropship_equipment/cas/weapon/bomblet_pod,
 /turf/open/floor/mainship/cargo/arrow{
 	dir = 1
 	},
@@ -21872,6 +21873,10 @@
 	dir = 8
 	},
 /area/mainship/medical/upper_medical)
+"rZa" = (
+/obj/structure/ship_ammo/cas/bomblet,
+/turf/open/floor/plating,
+/area/mainship/hallways/hangar)
 "rZc" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on,
 /obj/machinery/light/mainship{
@@ -22702,6 +22707,10 @@
 	dir = 1
 	},
 /area/mainship/hallways/port_ert)
+"sLf" = (
+/obj/structure/dropship_equipment/cas/weapon/bomb_pod,
+/turf/open/floor/mainship/red,
+/area/mainship/hallways/hangar)
 "sLm" = (
 /obj/machinery/flasher{
 	id = "Containment Cell 3";
@@ -26963,6 +26972,10 @@
 	},
 /turf/open/floor/mainship/floor,
 /area/mainship/engineering/starboard_atmos)
+"wzy" = (
+/obj/structure/ship_ammo/cas/bomb/fourhundred,
+/turf/open/floor/plating,
+/area/mainship/hallways/hangar)
 "wzR" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -38572,7 +38585,7 @@ rIp
 twS
 hIO
 smT
-ngt
+sLf
 hnt
 hfk
 uJJ
@@ -40103,7 +40116,7 @@ oUe
 oHG
 nTG
 mGC
-mGC
+wzy
 mGC
 jfL
 jcy
@@ -40205,7 +40218,7 @@ oUe
 oHG
 nTG
 mGC
-mGC
+rZa
 mGC
 mGC
 mtP

diff --git a/_maps/map_files/BigRed_v2/BigRed_v2.dmm b/_maps/map_files/BigRed_v2/BigRed_v2.dmm
@@ -11689,7 +11689,7 @@
 /area/bigredv2/outside/marshal_office)
 "kOk" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/stack/sheet/glass,
+/obj/item/stack/sheet/glass/glass,
 /turf/open/floor,
 /area/bigredv2/outside/engineering)
 "kPA" = (
@@ -12839,7 +12839,7 @@
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/stock_parts/smes_coil,
-/obj/item/stack/sheet/glass{
+/obj/item/stack/sheet/glass/glass{
 	amount = 30
 	},
 /turf/open/floor,

diff --git a/_maps/map_files/Campaign maps/patricks_rest/patricks_rest.dmm b/_maps/map_files/Campaign maps/patricks_rest/patricks_rest.dmm
@@ -9348,7 +9348,7 @@
 /area/patricks_rest/surface/building/residential_cent)
 "RL" = (
 /obj/structure/closet/crate/mass_produced_crate/supply,
-/obj/item/stack/sheet/glass/large_stack,
+/obj/item/stack/sheet/glass/glass/large_stack,
 /turf/open/floor/prison/darkbrown/full,
 /area/patricks_rest/surface/building/ore_storage)
 "RN" = (