Skip to content

Commit

Permalink
Adds a Valhalla surgery area, modifies the marine spawner xeno button. (
Browse files Browse the repository at this point in the history 
#16212)
  • Loading branch information
@Wisemonster
Wisemonster authored Jul 2, 2024
1 parent be1497f commit f1fed40
Show file tree
Hide file tree
Showing 2 changed files with 147 additions and 51 deletions.
169 changes: 120 additions & 49 deletions _maps/map_files/generic/Admin_Level.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1042,11 +1042,10 @@
/turf/open/floor/plating,
/area/centcom/valhalla)
"bgz" = (
/obj/machinery/vending/cigarette,
/obj/effect/turf_decal/warning_stripes/thick{
dir = 8
/obj/machinery/bioprinter/stocked,
/turf/open/floor/mainship/sterile/corner{
dir = 1
},
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla)
"bgM" = (
/obj/structure/table,
Expand Down Expand Up @@ -1418,6 +1417,10 @@
/obj/effect/turf_decal/tile/red,
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla)
"bMr" = (
/obj/machinery/vending/MarineMed/valhalla,
/turf/open/floor/mainship/sterile/corner,
/area/centcom/valhalla)
"bMv" = (
/obj/machinery/door/poddoor/shutters/mainship{
dir = 2;
Expand Down Expand Up @@ -2443,6 +2446,13 @@
/obj/structure/flora/ausbushes/ppflowers,
/turf/open/floor/grass,
/area/centcom/valhalla)
"dgG" = (
/obj/effect/turf_decal/warning_stripes/thick{
dir = 8
},
/obj/machinery/vending/cigarette,
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla)
"dgR" = (
/obj/structure/sign/vacuum,
/turf/closed/wall,
Expand Down Expand Up @@ -4887,7 +4897,7 @@
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla)
"gEX" = (
/obj/machinery/button/valhalla/xeno_button{
/obj/machinery/button/valhalla/marine_spawner{
link = "marineright"
},
/turf/open/floor/plating/ground/mars/random/cave,
Expand Down Expand Up @@ -5166,7 +5176,7 @@
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"hda" = (
/obj/machinery/button/valhalla/xeno_button{
/obj/machinery/button/valhalla/marine_spawner{
link = "marinetop"
},
/turf/open/floor/plating/ground/mars/random/cave,
Expand All @@ -5180,7 +5190,7 @@
/turf/open/floor/plating/scorched,
/area/centcom/valhalla)
"heB" = (
/obj/machinery/button/valhalla/xeno_button{
/obj/machinery/button/valhalla/marine_spawner{
link = "marineleft"
},
/turf/open/floor/plating/ground/mars/random/cave,
Expand Down Expand Up @@ -5320,6 +5330,13 @@
dir = 1
},
/area/centcom/valhalla)
"hnH" = (
/obj/machinery/door/airlock/mainship/medical/or/free_access{
dir = 2;
name = "\improper Medical Airlock"
},
/turf/open/floor/mainship/sterile/dark,
/area/centcom/valhalla)
"hnQ" = (
/obj/effect/turf_decal/warning_stripes/thick,
/obj/effect/turf_decal/warning_stripes/thick{
Expand Down Expand Up @@ -5359,6 +5376,12 @@
/obj/structure/closet/crate,
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla)
"hqA" = (
/obj/machinery/vending/medical/valhalla,
/turf/open/floor/mainship/sterile/side{
dir = 1
},
/area/centcom/valhalla)
"hrg" = (
/obj/item/storage/box/bodybags{
pixel_x = 3;
Expand Down Expand Up @@ -6714,6 +6737,12 @@
},
/turf/open/floor/mainship/stripesquare,
/area/centcom/valhalla)
"jvT" = (
/obj/machinery/button/valhalla/marine_spawner{
link = "marinesurgeryright"
},
/turf/open/floor/mainship/sterile/dark,
/area/centcom/valhalla)
"jxN" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
Expand Down Expand Up @@ -7513,6 +7542,12 @@
},
/turf/open/floor,
/area/tdome)
"kvr" = (
/obj/machinery/button/valhalla/marine_spawner{
link = "marinesurgeryleft"
},
/turf/open/floor/mainship/sterile/dark,
/area/centcom/valhalla)
"kxq" = (
/obj/structure/closet/crate,
/obj/machinery/firealarm{
Expand Down Expand Up @@ -8224,6 +8259,14 @@
/obj/item/storage/donut_box,
/turf/open/floor/grimy,
/area/centcom/valhalla)
"lIu" = (
/obj/machinery/optable,
/obj/effect/landmark/valhalla/marine_spawner_landmark{
where = "surgeryleft"
},
/obj/item/tank/anesthetic,
/turf/open/floor/mainship/sterile/dark,
/area/centcom/valhalla)
"lIC" = (
/turf/closed/wall/mainship,
/area/tdome)
Expand Down Expand Up @@ -10710,6 +10753,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/centcom/valhalla)
"pwE" = (
/obj/machinery/bioprinter/stocked,
/turf/open/floor/mainship/sterile/side{
dir = 1
},
/area/centcom/valhalla)
"pwR" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/warning_stripes/thick{
Expand Down Expand Up @@ -12385,6 +12434,9 @@
},
/turf/open/floor/tile/lightred/full,
/area/centcom/valhalla)
"sgT" = (
/turf/open/floor/mainship/sterile/side,
/area/centcom/valhalla)
"sis" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/air_alarm{
Expand Down Expand Up @@ -12786,6 +12838,11 @@
dir = 5
},
/area/centcom/valhalla)
"sGi" = (
/turf/open/floor/mainship/sterile/side{
dir = 8
},
/area/centcom/valhalla)
"sGw" = (
/obj/effect/ai_node,
/turf/open/floor/carpet/side{
Expand Down Expand Up @@ -13921,6 +13978,14 @@
/obj/effect/turf_decal/tile/pink,
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla)
"utb" = (
/obj/machinery/optable,
/obj/effect/landmark/valhalla/marine_spawner_landmark{
where = "surgeryright"
},
/obj/item/tank/anesthetic,
/turf/open/floor/mainship/sterile/dark,
/area/centcom/valhalla)
"utM" = (
/obj/effect/turf_decal/warning_stripes/thick,
/obj/structure/closet/crate/freezer,
Expand Down Expand Up @@ -14029,6 +14094,12 @@
},
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"uCL" = (
/obj/structure/table/mainship,
/turf/open/floor/mainship/sterile/side{
dir = 1
},
/area/centcom/valhalla)
"uEe" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/effect/turf_decal/tile/yellow{
Expand Down Expand Up @@ -19734,8 +19805,8 @@ xrI
xrI
xrI
xrI
vQc
jYG
xrI
xrI
jYG
jYG
jYG
Expand Down Expand Up @@ -19868,12 +19939,12 @@ xrI
xrI
xrI
xrI
wQi
xrI
xrI
xrI
jYG
jYG
box
box
box
box
box
box
box
box
Expand Down Expand Up @@ -20007,11 +20078,11 @@ xrI
xrI
xrI
xrI
xrI
xrI
jYG
jYG
jYG
box
bgz
sGi
sGi
jKv
box
nKg
jWH
Expand Down Expand Up @@ -20145,11 +20216,11 @@ xrI
xrI
xrI
xrI
xrI
xrI
xrI
jYG
jYG
box
uCL
kvr
lIu
sgT
box
foh
jWH
Expand Down Expand Up @@ -20283,11 +20354,11 @@ xrI
vQc
vQc
xXc
xXc
vQc
vQc
jYG
jYG
box
hqA
rfF
rfF
sgT
box
lPX
oNZ
Expand Down Expand Up @@ -20421,11 +20492,11 @@ fmR
fmR
vQc
fmR
vQc
fmR
fmR
fmR
jYG
box
uCL
jvT
utb
sgT
box
nKg
jWH
Expand Down Expand Up @@ -20559,11 +20630,11 @@ fmR
fmR
fmR
fmR
fmR
fmR
fmR
vQc
fmR
box
pwE
rfF
rfF
sgT
box
foh
jWH
Expand Down Expand Up @@ -20697,19 +20768,19 @@ fWu
fWu
fWu
fWu
fWu
fWu
fWu
fWu
fWu
box
bgz
bMr
fgO
fgO
bEo
hnH
mCI
rBJ
mCI
lMV
xgU
lMV
mCI
dgG
gMl
gJS
myT
Expand Down Expand Up @@ -20836,9 +20907,9 @@ fmR
fmR
fmR
aEn
bcm
fmR
fmR
box
bRv
bRv
bjQ
box
bog
Expand Down
29 changes: 27 additions & 2 deletions code/game/objects/machinery/buttons.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,12 +281,12 @@
CRASH("Valhalla button linked with an improper landmark: button ID: [link].")
linked = new xeno_wanted(get_turf(GLOB.valhalla_button_spawn_landmark[link]))

/obj/machinery/button/valhalla/xeno_button
/obj/machinery/button/valhalla/marine_spawner
name = "Marine spawner"
///The list of outfits we can equip on the humans we're spawning
var/outfit_list = list()

/obj/machinery/button/valhalla/xeno_button/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE)
/obj/machinery/button/valhalla/marine_spawner/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE)
var/list/job_outfits = list()
for(var/type in subtypesof(/datum/outfit/job))
if(istype(type, /datum/outfit))
Expand All @@ -311,6 +311,31 @@
return
linked.equipOutfit(job_outfits[selected_outfit], FALSE)

/obj/machinery/button/valhalla/marine_spawner/attack_hand(mob/living/user)
var/list/job_outfits = list()
for(var/type in subtypesof(/datum/outfit/job))
if(istype(type, /datum/outfit))
continue
var/datum/outfit/out = type
if(initial(out.can_be_admin_equipped))
job_outfits[initial(out.name)] = out

job_outfits = sortList(job_outfits)
job_outfits.Insert(1, "Naked")

var/datum/outfit/selected_outfit = tgui_input_list(usr, "Which outfit do you want the human to wear?", "Human spawn", job_outfits)
if(!selected_outfit)
return

QDEL_NULL(linked)
if(!get_turf(GLOB.valhalla_button_spawn_landmark[link]))
to_chat(user, span_warning("An error occured, yell at the coders."))
CRASH("Valhalla button linked with an improper landmark: button ID: [link].")
linked = new /mob/living/carbon/human(get_turf(GLOB.valhalla_button_spawn_landmark[link]))
if(selected_outfit == "Naked" || !selected_outfit)
return
linked.equipOutfit(job_outfits[selected_outfit], FALSE)

/obj/machinery/button/valhalla/vehicle_button
name = "Vehicle Spawner"

Expand Down

0 comments on commit f1fed40

Please sign in to comment.