Merge pull request #218 from Mirag1993/Мердж-с-оффами

ERT Minor Refactor, more ERTs, ERTs can now spawn on subshuttles (shiptest-ss13#2395)
CeladonSS13 · Dec 13, 2023 · f2ac161 · f2ac161
2 parents 0b1f2b1 + 8c839de
commit f2ac161
Show file tree

Hide file tree

Showing 33 changed files with 2,293 additions and 698 deletions.
diff --git a/_maps/outpost/indie_space.dmm b/_maps/outpost/indie_space.dmm
diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm
@@ -868,6 +868,7 @@
 /obj/item/radio/intercom/directional/north{
 	pixel_x = -3
 	},
+/obj/effect/landmark/ert_outpost_spawn,
 /turf/open/floor/plasteel/tech,
 /area/outpost/security/armory)
 "dv" = (
@@ -1723,6 +1724,7 @@
 /obj/effect/turf_decal/industrial/caution{
 	pixel_x = 17
 	},
+/obj/effect/landmark/ert_outpost_spawn,
 /turf/open/floor/plasteel/tech/grid,
 /area/outpost/security/armory)
 "gx" = (
@@ -2094,6 +2096,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
+/obj/effect/landmark/ert_outpost_spawn,
 /turf/open/floor/plasteel/tech/grid,
 /area/outpost/security/armory)
 "hW" = (
@@ -3511,6 +3514,7 @@
 	req_access_txt = "101";
 	pixel_x = -3
 	},
+/obj/effect/landmark/ert_outpost_spawn,
 /turf/open/floor/plasteel/tech,
 /area/outpost/security/armory)
 "mP" = (
@@ -3666,6 +3670,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
+/obj/effect/landmark/ert_outpost_spawn,
 /turf/open/floor/plasteel/tech/grid,
 /area/outpost/security/armory)
 "nz" = (
@@ -10238,6 +10243,7 @@
 	dir = 4
 	},
 /obj/machinery/airalarm/directional/east,
+/obj/effect/landmark/ert_outpost_spawn,
 /turf/open/floor/plasteel/tech,
 /area/outpost/security/armory)
 "JK" = (
@@ -10709,6 +10715,7 @@
 	dir = 8
 	},
 /obj/machinery/light/directional/west,
+/obj/effect/landmark/ert_outpost_spawn,
 /turf/open/floor/plasteel/tech,
 /area/outpost/security/armory)
 "Lv" = (

diff --git a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt
@@ -37,3 +37,5 @@ Name = "Falcon Dropship"
 Size = "13x7"
 Purpose = "A Nanotrasen dropship, primarily used by Heron-Class carriers."
 File Path = "_maps\shuttles\subshuttles\nanotrasen_falcon.dmm"
+
+
diff --git a/_maps/shuttles/subshuttles/frontiersmen_gut.dmm b/_maps/shuttles/subshuttles/frontiersmen_gut.dmm
@@ -247,6 +247,7 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plasteel/tech,
 /area/ship/storage)
 "qh" = (
@@ -341,6 +342,7 @@
 	},
 /obj/machinery/light/directional/east,
 /obj/machinery/power/apc/auto_name/directional/north,
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plasteel/tech,
 /area/ship/storage)
 "ue" = (
@@ -569,6 +571,7 @@
 	color = "#808080"
 	},
 /obj/machinery/light/directional/east,
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plasteel/tech,
 /area/ship/storage)
 "RY" = (
@@ -625,6 +628,7 @@
 	dir = 8;
 	color = "#808080"
 	},
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plasteel/tech,
 /area/ship/storage)
 "UA" = (
@@ -686,6 +690,7 @@
 	dir = 1;
 	name = "tactical chair"
 	},
+/obj/effect/landmark/ert_shuttle_brief_spawn,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/storage)
 

diff --git a/_maps/shuttles/subshuttles/independent_kunai.dmm b/_maps/shuttles/subshuttles/independent_kunai.dmm
@@ -99,6 +99,7 @@
 /obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/engine/hull/interior,
 /area/ship/storage)
 "al" = (
@@ -165,6 +166,7 @@
 /area/ship/storage)
 "bY" = (
 /obj/structure/chair/comfy/shuttle,
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/engine/hull/interior,
 /area/ship/storage)
 "cF" = (
@@ -333,6 +335,17 @@
 /obj/structure/grille,
 /turf/open/floor/engine/hull/reinforced,
 /area/ship/external)
+"pk" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/effect/landmark/ert_shuttle_brief_spawn,
+/turf/open/floor/plasteel/dark,
+/area/ship/storage)
 "qn" = (
 /obj/machinery/power/terminal,
 /obj/structure/cable,
@@ -391,6 +404,7 @@
 	dir = 1
 	},
 /obj/machinery/light/small/directional/south,
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/engine/hull/interior,
 /area/ship/storage)
 "DP" = (
@@ -493,6 +507,7 @@
 "SE" = (
 /obj/structure/chair/comfy/shuttle,
 /obj/machinery/light/small/directional/north,
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/engine/hull/interior,
 /area/ship/storage)
 "Wx" = (
@@ -572,7 +587,7 @@ gs
 Pq
 hJ
 bG
-RO
+pk
 bG
 hJ
 Pq

diff --git a/_maps/shuttles/subshuttles/independent_sugarcube.dmm b/_maps/shuttles/subshuttles/independent_sugarcube.dmm
@@ -79,13 +79,15 @@
 	pixel_y = 23;
 	pixel_x = -13
 	},
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plating,
 /area/ship/storage)
 "j" = (
 /obj/structure/chair{
 	dir = 4
 	},
 /obj/structure/window/reinforced/spawner/west,
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plating,
 /area/ship/storage)
 "k" = (
@@ -95,6 +97,7 @@
 /obj/structure/window/reinforced/spawner/west,
 /obj/structure/window/reinforced/spawner/east,
 /obj/machinery/light/directional/north,
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plating,
 /area/ship/storage)
 "l" = (
@@ -107,6 +110,7 @@
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plating,
 /area/ship/storage)
 "n" = (
@@ -147,6 +151,7 @@
 	},
 /obj/structure/window/reinforced/spawner/west,
 /obj/structure/window/reinforced/spawner/east,
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plating,
 /area/ship/storage)
 "s" = (
@@ -223,6 +228,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plating,
 /area/ship/storage)
 "A" = (
@@ -274,6 +280,7 @@
 	},
 /obj/structure/window/reinforced/spawner/west,
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plating,
 /area/ship/storage)
 "G" = (
@@ -283,6 +290,7 @@
 /obj/structure/window/reinforced/spawner/west,
 /obj/structure/window/reinforced/spawner/east,
 /obj/machinery/light/directional/south,
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plating,
 /area/ship/storage)
 "H" = (
@@ -294,6 +302,7 @@
 /obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plating,
 /area/ship/storage)
 "J" = (
@@ -308,6 +317,10 @@
 "L" = (
 /turf/closed/wall,
 /area/ship/engineering)
+"T" = (
+/obj/effect/landmark/ert_shuttle_brief_spawn,
+/turf/open/floor/plating,
+/area/ship/storage)
 "Z" = (
 /turf/closed/wall/rust,
 /area/ship/engineering)
@@ -380,7 +393,7 @@ b
 d
 l
 l
-y
+T
 l
 J
 "}

diff --git a/_maps/shuttles/subshuttles/nanotrasen_falcon.dmm b/_maps/shuttles/subshuttles/nanotrasen_falcon.dmm
@@ -36,6 +36,7 @@
 	dir = 8
 	},
 /obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plasteel,
 /area/ship/storage/eva)
 "e" = (
@@ -125,6 +126,7 @@
 	dir = 4;
 	pixel_y = 8
 	},
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/storage/eva)
 "m" = (
@@ -146,6 +148,7 @@
 /obj/machinery/vending/wallmed{
 	pixel_y = -28
 	},
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plasteel,
 /area/ship/storage/eva)
 "p" = (
@@ -174,6 +177,7 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plasteel,
 /area/ship/storage/eva)
 "s" = (
@@ -307,6 +311,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plasteel,
 /area/ship/storage/eva)
 "C" = (
@@ -379,6 +384,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plasteel,
 /area/ship/storage/eva)
 "J" = (
@@ -394,6 +400,7 @@
 	dir = 4
 	},
 /obj/item/radio/intercom/directional/north,
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plasteel,
 /area/ship/storage/eva)
 "L" = (
@@ -440,6 +447,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/effect/landmark/ert_shuttle_brief_spawn,
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/storage/eva)
 "N" = (
@@ -535,6 +543,7 @@
 	dir = 8;
 	pixel_y = 16
 	},
+/obj/effect/landmark/ert_shuttle_spawn,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/storage/eva)
 "U" = (

diff --git a/code/_globalvars/lists/mapping.dm b/code/_globalvars/lists/mapping.dm
@@ -34,6 +34,7 @@ GLOBAL_LIST_EMPTY(blobstart) //blobs, santa, respawning devils
 GLOBAL_LIST_EMPTY(secequipment) //sec equipment lockers that scale with the number of sec players
 GLOBAL_LIST_EMPTY(deathsquadspawn)
 GLOBAL_LIST_EMPTY(emergencyresponseteamspawn)
+GLOBAL_LIST_EMPTY(emergencyresponseteam_outpostspawn)
 GLOBAL_LIST_EMPTY(ruin_landmarks)
 GLOBAL_LIST_EMPTY(stationroom_landmarks) //List of all spawns for stationrooms
 

diff --git a/code/datums/browser.dm b/code/datums/browser.dm
@@ -399,7 +399,7 @@
 			if ("color")
 				settings["mainsettings"][setting]["value"] = input(user, "Enter new value for [settings["mainsettings"][setting]["desc"]]", "Enter new value for [settings["mainsettings"][setting]["desc"]]", settings["mainsettings"][setting]["value"]) as color
 			if ("boolean")
-				settings["mainsettings"][setting]["value"] = input(user, "[settings["mainsettings"][setting]["desc"]]?") in list("Yes","No")
+				settings["mainsettings"][setting]["value"] = (settings["mainsettings"][setting]["value"] == "Yes") ? "No" : "Yes"
 			if ("ckey")
 				settings["mainsettings"][setting]["value"] = input(user, "[settings["mainsettings"][setting]["desc"]]?") in list("none") + GLOB.directory
 		if (settings["mainsettings"][setting]["callback"])
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,3 +37,5 @@ Name = "Falcon Dropship"
		Size = "13x7"
		Purpose = "A Nanotrasen dropship, primarily used by Heron-Class carriers."
		File Path = "_maps\shuttles\subshuttles\nanotrasen_falcon.dmm"