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

Adds human target practice to Valhalla #16236

Merged
merged 1 commit into from
Jul 6, 2024
Merged
Changes from all commits
Commits
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
77 changes: 62 additions & 15 deletions _maps/map_files/generic/Admin_Level.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
/area/centcom/valhalla)
"ade" = (
/obj/effect/turf_decal/warning_stripes/thick,
/obj/machinery/button/valhalla/marine_button{
link = "xenoclose2"
/obj/machinery/button/valhalla/marine_spawner{
link = "marineshootingrightfar"
},
/turf/open/floor/mainship/stripesquare,
/area/centcom/valhalla)
Expand Down Expand Up @@ -2622,8 +2622,8 @@
/area/centcom/valhalla)
"dur" = (
/obj/effect/turf_decal/warning_stripes/thick,
/obj/machinery/button/valhalla/marine_button{
link = "xenofar2"
/obj/machinery/button/valhalla/marine_spawner{
link = "marineshootingrightclose"
},
/turf/open/floor/mainship/stripesquare,
/area/centcom/valhalla)
Expand Down Expand Up @@ -3195,6 +3195,9 @@
/area/centcom/valhalla)
"dXi" = (
/obj/item/stack/sheet/metal/large_stack,
/obj/effect/landmark/valhalla/marine_spawner_landmark{
where = "shootingrightclose"
},
/turf/open/floor/plating/scorched,
/area/centcom/valhalla)
"dXm" = (
Expand Down Expand Up @@ -4008,6 +4011,13 @@
/obj/machinery/camera/autoname/thunderdome/hidden,
/turf/open/floor/plating,
/area/tdome/tdome1)
"frN" = (
/obj/effect/turf_decal/warning_stripes/thick,
/obj/machinery/button/valhalla/marine_button{
link = "xenofar1"
},
/turf/open/floor/mainship/stripesquare,
/area/centcom/valhalla)
"frZ" = (
/obj/machinery/door/airlock/mainship/marine/general/sl{
dir = 3
Expand Down Expand Up @@ -6068,6 +6078,12 @@
dir = 1
},
/area/tdome/tdomeobserve)
"iuC" = (
/obj/effect/landmark/valhalla/marine_spawner_landmark{
where = "shootingrightfar"
},
/turf/open/floor/plating/ground/mars/random/cave,
/area/centcom/valhalla)
"iuT" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
Expand Down Expand Up @@ -6732,8 +6748,8 @@
/area/centcom/valhalla)
"jvR" = (
/obj/effect/turf_decal/warning_stripes/thick,
/obj/machinery/button/valhalla/marine_button{
link = "xenoclose1"
/obj/machinery/button/valhalla/marine_spawner{
link = "marineshootingleftfar"
},
/turf/open/floor/mainship/stripesquare,
/area/centcom/valhalla)
Expand Down Expand Up @@ -7221,6 +7237,13 @@
},
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla)
"kcV" = (
/obj/effect/turf_decal/warning_stripes/thick,
/obj/machinery/button/valhalla/marine_button{
link = "xenoclose1"
},
/turf/open/floor/mainship/stripesquare,
/area/centcom/valhalla)
"kcW" = (
/obj/effect/turf_decal/tile/black,
/obj/effect/turf_decal/tile/black{
Expand Down Expand Up @@ -8470,6 +8493,13 @@
},
/turf/open/floor/grimy,
/area/centcom/valhalla)
"lZP" = (
/obj/effect/turf_decal/warning_stripes/thick,
/obj/machinery/button/valhalla/marine_button{
link = "xenoclose2"
},
/turf/open/floor/mainship/stripesquare,
/area/centcom/valhalla)
"maE" = (
/obj/effect/turf_decal/warning_stripes/box,
/obj/machinery/vending/cola/nopower,
Expand Down Expand Up @@ -10659,6 +10689,13 @@
/obj/machinery/power/monitor,
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla)
"poF" = (
/obj/effect/turf_decal/warning_stripes/thick,
/obj/machinery/button/valhalla/marine_button{
link = "xenofar2"
},
/turf/open/floor/mainship/stripesquare,
/area/centcom/valhalla)
"ppm" = (
/obj/machinery/vending/armor_supply/valhalla,
/turf/open/floor/tile/dark/gray,
Expand Down Expand Up @@ -11912,6 +11949,13 @@
/obj/effect/landmark/itemspawner/cutewitch,
/turf/open/floor/plating,
/area/centcom/valhalla)
"rnA" = (
/obj/effect/turf_decal/sandedge/corner2,
/obj/effect/landmark/valhalla/marine_spawner_landmark{
where = "shootingleftfar"
},
/turf/open/floor/plating,
/area/centcom/valhalla)
"rnH" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/warning_stripes/thick{
Expand Down Expand Up @@ -14409,6 +14453,9 @@
"veZ" = (
/obj/item/explosive/grenade/flare/on,
/obj/effect/turf_decal/sandedge,
/obj/effect/landmark/valhalla/marine_spawner_landmark{
where = "shootingleftclose"
},
/turf/open/floor/plating,
/area/centcom/valhalla)
"vgc" = (
Expand Down Expand Up @@ -16603,12 +16650,12 @@
/turf/closed/wall/r_wall/unmeltable,
/area/centcom/valhalla)
"xVT" = (
/obj/machinery/button/valhalla/marine_button{
link = "xenofar1"
},
/obj/effect/turf_decal/warning_stripes/thick{
dir = 10
},
/obj/machinery/button/valhalla/marine_spawner{
link = "marineshootingleftclose"
},
/turf/open/floor/mainship/stripesquare,
/area/centcom/valhalla)
"xWb" = (
Expand Down Expand Up @@ -21189,7 +21236,7 @@ jvi
boq
boq
qhT
hdk
frN
jcx
ivs
cHJ
Expand Down Expand Up @@ -21465,7 +21512,7 @@ boq
dAJ
boq
mGD
hdk
kcV
jcx
kqf
cHJ
Expand Down Expand Up @@ -21596,7 +21643,7 @@ aMq
aMq
dlQ
bbO
jvi
rnA
fdy
boq
boq
Expand Down Expand Up @@ -24080,7 +24127,7 @@ aRf
awi
aMq
aMq
aMq
iuC
aMq
aMq
aMq
Expand Down Expand Up @@ -24225,7 +24272,7 @@ bPK
eDF
fdy
ghq
hdk
lZP
cto
ipO
jcI
Expand Down Expand Up @@ -24363,7 +24410,7 @@ boq
eFA
boq
ghq
hdk
poF
cKm
ivi
jdm
Expand Down
Loading