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

…-Corps
Xander3359 · Jun 9, 2024 · da55456 · da55456
2 parents a73b6a6 + 6de2c55
commit da55456
Show file tree

Hide file tree

Showing 224 changed files with 66,181 additions and 2,523 deletions.
diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -16,6 +16,7 @@
 		#include "map_files\icy_caves\icy_caves.dmm"
 		#include "map_files\Research_Outpost\Research_Outpost.dmm"
 		#include "map_files\Magmoor_Digsite_IV\Magmoor_Digsite_IV.dmm"
+		#include "map_files\kutjevo\kutjevo.dmm"
 		#include "map_files\Orion_Military_Outpost\orionoutpost.dmm"
 		#include "map_files\Arachne\TGS_Arachne.dmm"
 		#include "map_files\gelida_iv\gelida_iv.dmm"

diff --git a/_maps/kutjevo.json b/_maps/kutjevo.json
@@ -0,0 +1,10 @@
+{
+    "map_name": "Kutjevo Refinery",
+    "map_path": "map_files/kutjevo",
+    "map_file": "kutjevo.dmm",
+	"disk_sets": {
+		"basic": 1
+	},
+	"quickbuilds": 1800,
+	"announce_text": "An automated distress signal has been received from Nanotrasen colony Kutjevo Refinery, known for botanical research, export, and raw materials processing and refinement. The ###SHIPNAME### has been dispatched to investigate."
+}
diff --git a/_maps/map_files/Arachne/TGS_Arachne.dmm b/_maps/map_files/Arachne/TGS_Arachne.dmm
@@ -652,7 +652,7 @@
 /turf/open/floor/mainship/tcomms,
 /area/mainship/command/telecomms)
 "aDo" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/living/commandbunks)
 "aDL" = (
@@ -907,7 +907,7 @@
 /turf/open/floor/mainship/floor,
 /area/mainship/living/commandbunks)
 "aOG" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/squads/general)
 "aOH" = (
@@ -1771,7 +1771,7 @@
 /turf/open/floor/mainship/floor,
 /area/mainship/living/numbertwobunks)
 "bCG" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship/white,
 /area/mainship/medical/lounge)
 "bCU" = (
@@ -2169,7 +2169,7 @@
 	},
 /area/mainship/squads/general)
 "bYV" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship/white,
 /area/mainship/medical/medical_science)
 "bZg" = (
@@ -4022,7 +4022,7 @@
 /turf/open/floor/plating,
 /area/mainship/hallways/starboard_hallway)
 "duG" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/hallways/hangar/droppod)
 "duO" = (
@@ -4599,7 +4599,7 @@
 /obj/machinery/door/poddoor/shutters/mainship/selfdestruct{
 	dir = 1
 	},
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/command/self_destruct)
 "dUA" = (
@@ -4727,7 +4727,7 @@
 /turf/open/floor/mainship/sterile/dark,
 /area/mainship/medical/medical_science)
 "ecb" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/living/starboard_garden)
 "ecg" = (
@@ -5131,7 +5131,7 @@
 /turf/open/floor/mainship/sterile/dark,
 /area/mainship/medical/medical_science)
 "etL" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/living/evacuation)
 "etU" = (
@@ -5429,7 +5429,7 @@
 /turf/open/floor/mainship/sterile/dark,
 /area/mainship/medical/lounge)
 "eGk" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship/white,
 /area/mainship/medical)
 "eGQ" = (
@@ -5498,7 +5498,7 @@
 /turf/open/floor/mainship/blue,
 /area/mainship/living/bridgebunks)
 "eLf" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/engineering/ce_room)
 "eLi" = (
@@ -6321,7 +6321,7 @@
 /obj/machinery/door/firedoor/mainship{
 	dir = 8
 	},
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/open/floor/mainship/sterile/dark,
 /area/mainship/medical)
 "fqy" = (
@@ -6969,7 +6969,7 @@
 /turf/open/floor/mainship/black,
 /area/mainship/hallways/starboard_hallway)
 "fSD" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/living/bridgebunks)
 "fTn" = (
@@ -8128,7 +8128,7 @@
 /obj/machinery/door/firedoor/mainship{
 	dir = 2
 	},
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/open/floor/mainship/sterile/dark,
 /area/mainship/medical)
 "gSi" = (
@@ -8195,7 +8195,7 @@
 /turf/open/floor/mainship/floor,
 /area/mainship/hallways/port_ert)
 "gVu" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship/outer/reinforced,
 /area/mainship/shipboard/firing_range)
 "gVz" = (
@@ -11455,7 +11455,7 @@
 /turf/closed/wall/mainship,
 /area/mainship/living/cryo_cells)
 "jAG" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/shipboard/weapon_room)
 "jBl" = (
@@ -13898,7 +13898,7 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/mainship/living/commandbunks)
 "lvX" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/squads/req)
 "lwi" = (
@@ -14241,7 +14241,7 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/mainship/hallways/hangar)
 "lLL" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/engineering/engineering_workshop)
 "lLS" = (
@@ -14528,7 +14528,7 @@
 	},
 /area/mainship/hallways/hangar)
 "lXb" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/living/pilotbunks)
 "lXu" = (
@@ -14745,7 +14745,7 @@
 /turf/open/floor/mainship/black/full,
 /area/mainship/living/cryo_cells)
 "mef" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/shipboard/chief_mp_office)
 "mel" = (
@@ -15010,7 +15010,7 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/mainship/hallways/port_hallway)
 "mrs" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/hallways/repair_bay)
 "mrK" = (
@@ -15323,7 +15323,7 @@
 /turf/open/floor/mainship/silver,
 /area/mainship/living/evacuation)
 "mBI" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship/white,
 /area/mainship/medical/morgue)
 "mCg" = (
@@ -15345,7 +15345,7 @@
 	},
 /area/mainship/command/cic)
 "mCs" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/hallways/starboard_ert)
 "mCy" = (
@@ -17079,7 +17079,7 @@
 /turf/open/floor/mainship/floor,
 /area/mainship/living/evacuation)
 "oaM" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/living/cryo_cells)
 "oaU" = (
@@ -17743,7 +17743,7 @@
 /turf/open/floor/plating,
 /area/mainship/hallways/port_hallway)
 "oCL" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/command/telecomms)
 "oCN" = (
@@ -17820,7 +17820,7 @@
 /turf/open/floor/mainship/floor,
 /area/mainship/squads/req)
 "oFn" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship/white,
 /area/mainship/medical/upper_medical)
 "oFr" = (
@@ -18567,7 +18567,7 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/mainship/squads/general)
 "poz" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship/white,
 /area/mainship/medical/cmo_office)
 "poI" = (
@@ -19667,7 +19667,7 @@
 /obj/machinery/door/firedoor/mainship{
 	dir = 2
 	},
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/open/floor/mainship/floor,
 /area/mainship/living/numbertwobunks)
 "qmG" = (
@@ -19793,7 +19793,7 @@
 /turf/open/floor/wood,
 /area/mainship/living/bridgebunks)
 "qpR" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship/outer,
 /area/mainship/shipboard/weapon_room)
 "qqq" = (
@@ -19934,7 +19934,7 @@
 	},
 /area/mainship/hallways/starboard_hallway)
 "qwU" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/command/cic)
 "qxI" = (
@@ -20010,7 +20010,7 @@
 /turf/open/floor/mainship/silver/full,
 /area/mainship/living/evacuation)
 "qCd" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/shipboard/firing_range)
 "qCF" = (
@@ -20840,7 +20840,7 @@
 /turf/open/floor/mainship/floor,
 /area/mainship/squads/general)
 "rkn" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/command/corporateliaison)
 "rkt" = (
@@ -22361,7 +22361,7 @@
 /turf/open/floor/mainship/black/full,
 /area/mainship/living/cryo_cells)
 "ssO" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/hallways/hangar)
 "ssR" = (
@@ -22654,7 +22654,7 @@
 /turf/open/floor/mainship/black/full,
 /area/mainship/living/cryo_cells)
 "sJS" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/shipboard/brig_cells)
 "sKc" = (
@@ -23289,7 +23289,7 @@
 /area/mainship/hallways/hangar)
 "tuj" = (
 /obj/structure/cable,
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/engineering/engine_core)
 "tuC" = (
@@ -25007,7 +25007,7 @@
 /turf/open/floor/plating,
 /area/mainship/medical/medical_science)
 "uRm" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/living/grunt_rnr)
 "uRr" = (
@@ -25468,7 +25468,7 @@
 /turf/open/floor/plating,
 /area/mainship/command/cic)
 "vkU" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship/white,
 /area/mainship/medical/operating_room_one)
 "vkZ" = (
@@ -27823,7 +27823,7 @@
 	},
 /area/mainship/squads/general)
 "xgK" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/living/numbertwobunks)
 "xha" = (
@@ -27981,7 +27981,7 @@
 /turf/open/floor/mainship_hull,
 /area/space)
 "xpP" = (
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /turf/closed/wall/mainship,
 /area/mainship/command/airoom)
 "xpW" = (
@@ -28737,7 +28737,7 @@
 /obj/machinery/door/poddoor/shutters/mainship/open/medical{
 	dir = 8
 	},
-/obj/effect/soundplayer,
+/obj/effect/soundplayer/deltaplayer,
 /obj/machinery/door/firedoor/mainship{
 	dir = 8
 	},