Skip to content

Commit

Permalink
ERT Minor Refactor, more ERTs, ERTs can now spawn on subshuttles (#2395)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Ports tgstation/tgstation#71348 and
tgstation/tgstation#56345, with code adapted for
Shiptest.

Also adds the following ERTs:
* NT Loss Prevention
* Frontiersmen
* Inteq
* Minutemen
  * Riot Control
  * BARD
  * GOLD Collector
* Syndicate
  * Gorlex Maruders
  * Cybersun Commando
  * Cybersun Paramedic
* SolGov
  * Sonnensoldner
  * Solarian Inspector

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

adminbus funny

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl: Zonespace27, Ryll-Ryll, MeeMOfCourse
tweak: Admins can now spawn an unarmed horde of interns in addition to
the old armed horde
tweak: Admins can toggle name randomization for ERT's, as well as if
they'd like to be spawned in the briefing room at the time of creation
tweak: Admins can now force ERT's to pick the leader role from the most
experienced candidates in terms of playtime
tweak: Menus like Create Response Team and Create Portal Storm now
toggle boolean options when clicked, rather than open a popup window to
select one of the two options
refactor: Centcom Officials are now a full subtype of ERT, rather than
being a separate antagonist type with duplicated functionality
admin: ERTs can now have a custom shuttle that they can spawn on, on a
toggle while creating said ERT.
admin: Shiptest-Specific ERTs, and respective files.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: meem <[email protected]>
Co-authored-by: Mark Suckerberg <[email protected]>
  • Loading branch information
meemofcourse and MarkSuckerberg authored Dec 12, 2023
1 parent f84118d commit a194f44
Show file tree
Hide file tree
Showing 33 changed files with 2,293 additions and 698 deletions.
1,072 changes: 705 additions & 367 deletions _maps/outpost/indie_space.dmm

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions _maps/outpost/nanotrasen_asteroid.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down
2 changes: 2 additions & 0 deletions _maps/shuttles/subshuttles/Subshuttle Catalog.txt
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"


5 changes: 5 additions & 0 deletions _maps/shuttles/subshuttles/frontiersmen_gut.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -625,6 +628,7 @@
dir = 8;
color = "#808080"
},
/obj/effect/landmark/ert_shuttle_spawn,
/turf/open/floor/plasteel/tech,
/area/ship/storage)
"UA" = (
Expand Down Expand Up @@ -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)

Expand Down
17 changes: 16 additions & 1 deletion _maps/shuttles/subshuttles/independent_kunai.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -572,7 +587,7 @@ gs
Pq
hJ
bG
RO
pk
bG
hJ
Pq
Expand Down
15 changes: 14 additions & 1 deletion _maps/shuttles/subshuttles/independent_sugarcube.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand All @@ -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" = (
Expand All @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand All @@ -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" = (
Expand All @@ -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" = (
Expand All @@ -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)
Expand Down Expand Up @@ -380,7 +393,7 @@ b
d
l
l
y
T
l
J
"}
Expand Down
9 changes: 9 additions & 0 deletions _maps/shuttles/subshuttles/nanotrasen_falcon.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand All @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand All @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/lists/mapping.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion code/datums/browser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down
Loading

0 comments on commit a194f44

Please sign in to comment.