Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ERT Minor Refactor, more ERTs, ERTs can now spawn on subshuttles #2395

Merged
merged 61 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from 53 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
dce7483
it works on my machine
meemofcourse Oct 3, 2023
f81e998
Merge remote-tracking branch 'upstream/master' into ert
meemofcourse Oct 4, 2023
661484f
erts and shuttle
meemofcourse Oct 4, 2023
4a8e899
ouuugh
meemofcourse Oct 5, 2023
f9d1c58
fuck
meemofcourse Oct 5, 2023
506ac70
Merge branch 'master' into ert
meemofcourse Oct 12, 2023
70ff49f
crux + moar outfit updates
meemofcourse Oct 12, 2023
4d60ab8
Merge remote-tracking branch 'upstream/master' into ert
meemofcourse Oct 15, 2023
71b583d
a
meemofcourse Oct 15, 2023
69102a6
Merge branch 'master' into ert
meemofcourse Oct 15, 2023
dd6681c
fix tests
meemofcourse Oct 15, 2023
c3df812
bruh..........
meemofcourse Oct 15, 2023
1298258
Merge remote-tracking branch 'upstream/master' into ert
meemofcourse Oct 22, 2023
3945ca3
Merge remote-tracking branch 'upstream/master' into ert
meemofcourse Oct 22, 2023
3851418
try again
meemofcourse Oct 22, 2023
7b231f2
Merge remote-tracking branch 'upstream/master' into ert
meemofcourse Oct 28, 2023
a9ceb0b
fucking BACKPACKS
meemofcourse Oct 28, 2023
7de8b5c
oops
meemofcourse Oct 28, 2023
41c8a40
Merge branch 'master' into ert
meemofcourse Nov 3, 2023
bac3138
shuttle is kil
meemofcourse Nov 3, 2023
25d6b4b
Merge branch 'ert' of https://github.com/meemofcourse/Shiptest into ert
meemofcourse Nov 3, 2023
e35619e
loss prevention outfit updates
meemofcourse Nov 4, 2023
18b94b8
minutemen outfit updates
meemofcourse Nov 4, 2023
04f3f2c
why did the solgov inspector have a halberd
meemofcourse Nov 4, 2023
fbe4eff
inteq outfit updates
meemofcourse Nov 4, 2023
1765b5a
frontiersmen outfit updates
meemofcourse Nov 4, 2023
d2e80e0
aaaaargghhhh
meemofcourse Nov 4, 2023
d683871
oops
meemofcourse Nov 4, 2023
78f5b0a
Merge branch 'master' into ert
meemofcourse Nov 4, 2023
91db911
minor gripes
meemofcourse Nov 8, 2023
729364b
oops
meemofcourse Nov 8, 2023
c5feaa2
Merge branch 'master' into ert
meemofcourse Nov 8, 2023
39b5693
kill people i think
meemofcourse Nov 9, 2023
f52c005
Merge branch 'ert' of https://github.com/meemofcourse/Shiptest into ert
meemofcourse Nov 9, 2023
29c1d75
Merge branch 'master' into ert
meemofcourse Nov 9, 2023
87c2815
blurb
meemofcourse Nov 9, 2023
9c0f7b3
shortage of volunteers
meemofcourse Nov 9, 2023
4a1f47c
Merge branch 'master' into ert
meemofcourse Nov 9, 2023
86566a6
outpost spawn + some other garbage
meemofcourse Nov 10, 2023
c3b0c45
Merge branch 'master' into ert
meemofcourse Nov 10, 2023
c851163
oops
meemofcourse Nov 10, 2023
565164c
Merge branch 'ert' of https://github.com/meemofcourse/Shiptest into ert
meemofcourse Nov 10, 2023
3d2888d
indies
meemofcourse Nov 13, 2023
370b317
gough
meemofcourse Nov 13, 2023
08ab1a0
c
meemofcourse Nov 14, 2023
5bc9d92
Merge branch 'master' into ert
meemofcourse Nov 14, 2023
f73483c
Merge remote-tracking branch 'upstream/master' into ert
meemofcourse Nov 16, 2023
63a7cec
Merge remote-tracking branch 'upstream/master' into ert
meemofcourse Nov 16, 2023
a45659b
ouugh
meemofcourse Nov 17, 2023
1220d64
Merge branch 'master' into ert
meemofcourse Nov 17, 2023
1fc3f2a
Update indie_space.dmm
meemofcourse Nov 18, 2023
952d1b2
sdssddsds
meemofcourse Nov 18, 2023
938e73e
Merge remote-tracking branch 'upstream/master' into ert
meemofcourse Nov 18, 2023
74a2e3c
Update nanotrasen_ert.dm
meemofcourse Nov 18, 2023
d4616b8
Merge branch 'master' into ert
meemofcourse Nov 22, 2023
7080fd9
Merge remote-tracking branch 'upstream/master' into ert
meemofcourse Nov 25, 2023
4c9aeac
screaming
meemofcourse Nov 27, 2023
d7f831b
the salami lid
meemofcourse Dec 6, 2023
6d7d746
Merge branch 'master' into ert
meemofcourse Dec 6, 2023
5b59395
Update nanotrasen_ert.dm
meemofcourse Dec 6, 2023
42cdcab
oops
MarkSuckerberg Dec 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading