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

Expansion of the Emergency Response Corps (TAKE TWO) #4320

Merged
merged 57 commits into from
Dec 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
23a3477
implements a very basic ert hardsuit
SirNightKnight Nov 17, 2024
d8ccf4c
gah forgot to make it a DM file
SirNightKnight Nov 17, 2024
2a86146
ERT backpack touch ups
SirNightKnight Nov 17, 2024
f921464
fixes
SirNightKnight Nov 17, 2024
9154678
and so it beings... adds the commander space suit
SirNightKnight Nov 17, 2024
b6d7b44
adds ert medical space suit
SirNightKnight Nov 17, 2024
6481c9e
whoops
SirNightKnight Nov 17, 2024
3f37995
adds ert security space suit
SirNightKnight Nov 18, 2024
cd30733
adds ert chaplain, engineer, and janitor space suits
SirNightKnight Nov 18, 2024
609ada5
fixes backpack layering issue
SirNightKnight Nov 18, 2024
4376ee1
honk
SirNightKnight Nov 18, 2024
8e039bc
finishes off clown ert space suit
SirNightKnight Nov 19, 2024
89b0e9b
ERT shuttle stuff
SirNightKnight Nov 19, 2024
2ef9340
more shuttle areas
SirNightKnight Nov 20, 2024
f2f4c88
first try at an ERT shuttle?...
SirNightKnight Nov 20, 2024
4465ade
shuttle fixes + lights
SirNightKnight Nov 20, 2024
b8cbac6
test ert and MORE shuttle fixes
SirNightKnight Nov 20, 2024
7f3496d
fun :)
SirNightKnight Nov 20, 2024
95b1a5e
more fixes!!
SirNightKnight Nov 20, 2024
bfd4c33
shuttle decal fix
SirNightKnight Nov 20, 2024
e925351
more ert shuttle adjustments
SirNightKnight Nov 20, 2024
049d81b
s moment
SirNightKnight Nov 20, 2024
bc29ef2
final set of fixes?
SirNightKnight Nov 20, 2024
e90ab29
buttons
SirNightKnight Nov 20, 2024
aa632e8
atmos alert > station alert
SirNightKnight Nov 20, 2024
dbc39b0
another s moment
SirNightKnight Nov 20, 2024
198a8da
converted to TGM BEGONE FAILED CL CHECK
SirNightKnight Nov 20, 2024
0b460cf
someday this will pass checks
SirNightKnight Nov 20, 2024
fae7d14
revenge of the double table
SirNightKnight Nov 20, 2024
edc7893
first pass of a duster implant
SirNightKnight Nov 20, 2024
4168704
dusting implant done and dusted
SirNightKnight Nov 20, 2024
686c434
nanotrasen energy shield module
SirNightKnight Nov 21, 2024
60a6e9a
last time i am touching ert_generic.dmm
SirNightKnight Nov 21, 2024
b388dc1
ert swat mask
SirNightKnight Nov 21, 2024
4f4f3cf
Merge branch 'master' of https://github.com/Monkestation/Monkestation2.0
SirNightKnight Nov 21, 2024
b874d77
NT survival box
SirNightKnight Nov 21, 2024
464ed47
cannot find file my ass
SirNightKnight Nov 21, 2024
6b840b3
ert survival box
SirNightKnight Nov 21, 2024
afc2db4
ERT survival box
SirNightKnight Nov 21, 2024
fe3b281
done for now
SirNightKnight Nov 21, 2024
edbc4ab
switching pcs
SirNightKnight Nov 29, 2024
dd89867
ERT ids
Dec 1, 2024
39109e9
Merge branch 'master' into NK-ERT2
Dec 1, 2024
eeb60cc
how many commits is too many
Dec 3, 2024
e23448f
more shuttles
Dec 4, 2024
d685e2b
updates door remotes to use the unused better sprites i found randoml…
Dec 5, 2024
c23b9fe
messed up the pathing
Dec 5, 2024
d501ffc
makes the engineering space suit slightly more yellow cus it bothered me
Dec 6, 2024
3271899
i'm tired
Dec 7, 2024
98cf2d4
switching branches
Dec 7, 2024
a7c63b5
deathsquad shuttle
Dec 8, 2024
721b832
ert greet sound
Dec 8, 2024
c421060
the end is nigh
Dec 8, 2024
861e110
naptime
Dec 8, 2024
88aeb16
whoops
Dec 8, 2024
36092cd
fixes
Dec 9, 2024
3e280c0
more base ERT access
Dec 14, 2024
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
371 changes: 371 additions & 0 deletions _maps/shuttles/ert_deathsquad.dmm
Original file line number Diff line number Diff line change
@@ -0,0 +1,371 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/obj/effect/turf_decal/stripes/red/box,
/obj/structure/fans/tiny,
/obj/machinery/door/poddoor{
dir = 8;
id = "rightdoor"
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"b" = (
/obj/machinery/button/door/directional/east{
req_access = list(188);
id = "rightdoor"
},
/obj/machinery/light/red/dim/directional/east,
/obj/machinery/computer/mech_bay_power_console{
dir = 8
},
/obj/effect/turf_decal/stripes/end{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"c" = (
/obj/machinery/power/shuttle_engine/heater,
/obj/structure/window/reinforced/plasma/spawner/directional/north,
/turf/open/floor/plating/airless,
/area/shuttle/ert/powered/deathsquad)
"e" = (
/turf/open/space/basic,
/area/template_noop)
"f" = (
/obj/structure/chair/comfy/shuttle{
dir = 1;
name = "tactical chair"
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"g" = (
/obj/machinery/door/poddoor{
dir = 8;
id = "cockpit"
},
/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating/airless,
/area/shuttle/ert/powered/deathsquad)
"i" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 4
},
/obj/structure/chair/comfy/shuttle{
dir = 8;
name = "tactical chair"
},
/obj/machinery/light/red/dim/directional/east,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"j" = (
/obj/machinery/power/shuttle_engine/propulsion,
/obj/docking_port/mobile/ert{
dir = 2
},
/turf/open/floor/plating/airless,
/area/shuttle/ert/powered/deathsquad)
"k" = (
/obj/effect/landmark/ert_shuttle_brief_spawn,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"l" = (
/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/obj/machinery/door/poddoor{
dir = 8;
id = "cockpit"
},
/turf/open/floor/plating/airless,
/area/shuttle/ert/powered/deathsquad)
"m" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 4
},
/obj/effect/turf_decal/caution/stand_clear/red{
dir = 8
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"n" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 10
},
/obj/structure/chair/comfy/shuttle{
dir = 8;
name = "tactical chair"
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"o" = (
/obj/effect/turf_decal/stripes{
dir = 1
},
/obj/effect/turf_decal/stripes,
/obj/machinery/computer/shuttle/ert/deathsquad,
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/ert/powered/deathsquad)
"p" = (
/obj/effect/turf_decal/stripes/red/box,
/obj/structure/fans/tiny,
/obj/machinery/door/poddoor{
dir = 8;
id = "leftdoor"
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"q" = (
/obj/machinery/teleport/station,
/obj/effect/turf_decal/stripes{
dir = 1
},
/obj/effect/turf_decal/stripes,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"r" = (
/obj/machinery/power/shuttle_engine/propulsion,
/turf/open/floor/plating/airless,
/area/shuttle/ert/powered/deathsquad)
"s" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/shuttle/ert/powered/deathsquad)
"u" = (
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"w" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 8
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/machinery/light/red/dim/directional/west,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"x" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 1
},
/obj/effect/landmark/ert_shuttle_spawn,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"y" = (
/obj/effect/turf_decal/caution/red{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"A" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 8
},
/obj/machinery/button/door/directional/west{
id = "leftdoor";
req_access = list(188)
},
/obj/machinery/light/red/dim/directional/west,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"B" = (
/obj/machinery/computer/teleporter{
dir = 1
},
/obj/effect/turf_decal/stripes/end{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"C" = (
/obj/effect/landmark/ert_shuttle_spawn,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"D" = (
/obj/item/storage/box/syndie_kit/imp_deathrattle/nanotrasen,
/obj/structure/rack,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"E" = (
/obj/structure/rack,
/obj/item/stack/cable_coil/five,
/obj/item/weldingtool/experimental,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"F" = (
/obj/structure/table/reinforced,
/obj/machinery/button/door{
id = "cockpit";
req_access = list(188)
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"H" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 8
},
/obj/effect/turf_decal/caution/stand_clear/red{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"I" = (
/obj/effect/turf_decal/delivery/red,
/obj/vehicle/sealed/mecha/working/ripley/deathripley/real/elite,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"K" = (
/obj/machinery/mech_bay_recharge_port{
dir = 8
},
/obj/effect/turf_decal/stripes/end,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"N" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 6
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"O" = (
/obj/effect/turf_decal/stripes/end{
dir = 8
},
/obj/machinery/computer/security,
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/ert/powered/deathsquad)
"P" = (
/obj/machinery/teleport/hub,
/obj/effect/turf_decal/stripes/end{
dir = 8
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"R" = (
/obj/machinery/door/airlock/hatch{
id_tag = "infiltrator_bridge";
name = "Infiltrator Bridge"
},
/obj/effect/mapping_helpers/airlock/access/any/admin/specops,
/obj/effect/turf_decal/stripes{
dir = 1
},
/obj/effect/turf_decal/stripes,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"T" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 1
},
/obj/machinery/vending/wallmed/directional/north,
/obj/effect/landmark/ert_shuttle_spawn,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"U" = (
/turf/closed/wall/r_wall/syndicate,
/area/shuttle/ert/powered/deathsquad)
"Y" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/ert/powered/deathsquad)
"Z" = (
/obj/effect/turf_decal/stripes/end{
dir = 4
},
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/ert/deathsquad{
x_offset = -1;
y_offset = 7
},
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/ert/powered/deathsquad)

(1,1,1) = {"
e
e
U
s
U
U
p
U
U
U
e
"}
(2,1,1) = {"
U
U
U
U
N
w
H
A
P
c
r
"}
(3,1,1) = {"
l
O
Y
U
T
C
u
u
q
c
r
"}
(4,1,1) = {"
l
o
f
R
x
D
E
k
B
c
j
"}
(5,1,1) = {"
g
Z
F
U
x
C
u
y
I
c
r
"}
(6,1,1) = {"
U
U
U
U
n
i
m
b
K
c
r
"}
(7,1,1) = {"
e
e
U
s
U
U
a
U
U
U
e
"}
Loading
Loading