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

…-Corps
Xander3359 · May 22, 2024 · 7376439 · 7376439
2 parents e953dfa + d3aeead
commit 7376439
Show file tree

Hide file tree

Showing 265 changed files with 10,867 additions and 6,349 deletions.
diff --git a/_maps/map_files/Arachne/TGS_Arachne.dmm b/_maps/map_files/Arachne/TGS_Arachne.dmm
@@ -14281,10 +14281,6 @@
 	},
 /turf/open/floor/mainship/sterile/dark,
 /area/mainship/medical)
-"lNQ" = (
-/obj/effect/attach_point/weapon/dropship1,
-/turf/open/floor/plating,
-/area/mainship/hallways/hangar)
 "lOu" = (
 /obj/effect/turf_decal/warning_stripes/thin{
 	dir = 10
@@ -22333,12 +22329,6 @@
 	},
 /turf/open/floor/wood,
 /area/mainship/living/cafeteria_officer)
-"sqK" = (
-/obj/effect/attach_point/weapon/dropship2{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/mainship/hallways/hangar)
 "sqT" = (
 /turf/open/floor/mainship/black{
 	dir = 1
@@ -27241,12 +27231,6 @@
 	},
 /turf/open/floor/mainship/floor,
 /area/mainship/hallways/starboard_hallway)
-"wDJ" = (
-/obj/effect/attach_point/weapon/dropship2{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/mainship/hallways/hangar)
 "wDK" = (
 /obj/structure/cable,
 /obj/machinery/holopad,
@@ -27948,10 +27932,6 @@
 /obj/structure/cable,
 /turf/open/floor/mainship/sterile/dark,
 /area/mainship/medical/operating_room_one)
-"xkA" = (
-/obj/effect/attach_point/electronics/dropship1,
-/turf/open/floor/plating,
-/area/mainship/hallways/hangar)
 "xlh" = (
 /obj/effect/turf_decal/warning_stripes/thin,
 /turf/open/floor/mainship/cargo/arrow{
@@ -36402,7 +36382,7 @@ vAL
 mGC
 jfL
 jcy
-lNQ
+mGC
 mGC
 mGC
 mGC
@@ -36504,7 +36484,7 @@ vAL
 rik
 rik
 bHy
-xkA
+mGC
 mGC
 mGC
 mGC
@@ -37116,7 +37096,7 @@ vAL
 uST
 uST
 uhS
-xkA
+mGC
 mGC
 mGC
 mGC
@@ -37218,7 +37198,7 @@ vAL
 mGC
 jfL
 jcy
-lNQ
+mGC
 mGC
 mGC
 mGC
@@ -39365,7 +39345,7 @@ krc
 bHy
 mGC
 fjj
-sqK
+mGC
 mGC
 mGC
 mGC
@@ -40385,7 +40365,7 @@ mtP
 uhS
 mGC
 fjj
-wDJ
+mGC
 mGC
 mGC
 mGC

diff --git a/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm b/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm
@@ -1261,8 +1261,8 @@
 "gn" = (
 /obj/structure/table/woodentable,
 /obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
 /turf/open/floor/wood,
 /area/campaign/jungle_outpost/outpost/command)
 "go" = (
@@ -4598,8 +4598,8 @@
 "xi" = (
 /obj/structure/closet/cabinet,
 /obj/item/reagent_containers/food/drinks/flask,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
 /obj/item/reagent_containers/food/drinks/bottle/experimentalliquor,
 /obj/item/reagent_containers/food/drinks/bottle/specialwhiskey,
 /turf/open/floor/wood/alt_four,
@@ -8965,7 +8965,7 @@
 "Te" = (
 /obj/structure/table/fancywoodentable,
 /obj/item/reagent_containers/food/drinks/bottle/whiskey,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
 /obj/machinery/light{
 	dir = 4
 	},

diff --git a/_maps/map_files/Campaign maps/nt_base/nt_base.dmm b/_maps/map_files/Campaign maps/nt_base/nt_base.dmm
@@ -7323,7 +7323,7 @@
 /turf/open/floor/prison/darkbrown/full,
 /area/gelida/indoors/c_block/casino)
 "fnH" = (
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 11;
 	pixel_y = 3
 	},
@@ -16940,11 +16940,11 @@
 "mxk" = (
 /obj/structure/table/fancywoodentable,
 /obj/item/clothing/suit/storage/snow_suit,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = -1;
 	pixel_y = 17
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = -1;
 	pixel_y = 5
 	},
@@ -17775,11 +17775,11 @@
 	pixel_x = -7;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 14;
 	pixel_y = 17
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 14;
 	pixel_y = 5
 	},
@@ -22183,7 +22183,7 @@
 /area/gelida/indoors/b_block/bridge)
 "qju" = (
 /obj/structure/table/gamblingtable,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 14;
 	pixel_y = 9
 	},
@@ -22968,7 +22968,7 @@
 /turf/open/floor/prison,
 /area/gelida/indoors/a_block/admin)
 "qNE" = (
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 12;
 	pixel_y = 16
 	},
@@ -23187,7 +23187,7 @@
 /area/gelida/landing_zone_forecon/UD6_Typhoon)
 "qUZ" = (
 /obj/structure/table/gamblingtable,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 6;
 	pixel_y = 12
 	},
@@ -26678,7 +26678,7 @@
 /area/gelida/indoors/a_block/dorms)
 "ttT" = (
 /obj/structure/table/fancywoodentable,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 13;
 	pixel_y = 17
 	},
@@ -31114,7 +31114,7 @@
 /area/gelida/landing_zone_forecon/UD6_Typhoon)
 "wMf" = (
 /obj/structure/table/fancywoodentable,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 12;
 	pixel_y = 17
 	},

diff --git a/_maps/map_files/Campaign maps/orion_2/orionoutpost_2.dmm b/_maps/map_files/Campaign maps/orion_2/orionoutpost_2.dmm
@@ -7014,14 +7014,6 @@
 /obj/machinery/vending/security,
 /turf/open/floor/mainship/red,
 /area/orion_outpost/surface/building/monitor)
-"HG" = (
-/obj/effect/attach_point/weapon/dropship1{
-	dir = 8
-	},
-/turf/open/floor/plating/icefloor/warnplate{
-	dir = 8
-	},
-/area/orion_outpost/surface/landing_pad_2)
 "HJ" = (
 /obj/effect/ai_node,
 /turf/open/floor/plating/ground/mars/random/cave/darker,
@@ -7364,10 +7356,6 @@
 /obj/structure/window/framed/mainship/gray,
 /turf/open/floor/wood,
 /area/orion_outpost/surface/building/barracks)
-"Ju" = (
-/obj/effect/attach_point/electronics/dropship1,
-/turf/open/floor/plating,
-/area/orion_outpost/surface/landing_pad_2)
 "Jw" = (
 /turf/open/floor/mainship/orange,
 /area/orion_outpost/surface/building/cargo)
@@ -10209,10 +10197,6 @@
 /obj/structure/stairs/seamless/edge,
 /turf/open/floor/mainship/mono,
 /area/orion_outpost/surface/building/vehicledepot)
-"WH" = (
-/obj/effect/attach_point/weapon/dropship1,
-/turf/open/floor/plating,
-/area/orion_outpost/surface/landing_pad_2)
 "WI" = (
 /obj/structure/cable,
 /turf/open/floor/mainship/mono,
@@ -12526,7 +12510,7 @@ Gx
 Gx
 Gx
 Gx
-HG
+Gx
 Gx
 Gx
 Kz
@@ -12654,7 +12638,7 @@ EJ
 IH
 ft
 rS
-WH
+ft
 ft
 ft
 ft
@@ -12786,7 +12770,7 @@ nQ
 IH
 ft
 ft
-Ju
+ft
 ft
 ft
 ft
@@ -13578,7 +13562,7 @@ EJ
 IH
 ft
 ft
-Ju
+ft
 ft
 ft
 ft
@@ -13710,7 +13694,7 @@ EJ
 IH
 ft
 rS
-WH
+ft
 ft
 ft
 ft

diff --git a/_maps/map_files/Campaign maps/patricks_rest/patricks_rest.dmm b/_maps/map_files/Campaign maps/patricks_rest/patricks_rest.dmm
@@ -2844,7 +2844,7 @@
 /area/patricks_rest/surface/building/ore_storage)
 "mF" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
 /turf/open/floor/grayscale/black,
 /area/patricks_rest/surface/building/residential_cent)
 "mG" = (
@@ -4834,8 +4834,8 @@
 /area/patricks_rest/surface/building/residential_cent)
 "vL" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
 /turf/open/floor/grayscale/black,
 /area/patricks_rest/surface/building/residential_cent)
 "vM" = (
@@ -9339,7 +9339,7 @@
 /area/patricks_rest/surface/building/barracks)
 "RK" = (
 /obj/structure/table/reinforced/prison,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
 /turf/open/floor/prison/sterilewhite,
 /area/patricks_rest/surface/building/residential_cent)
 "RL" = (