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

Pizza Station is back on the menu #5887

Merged
merged 16 commits into from
Mar 17, 2024
Merged
3 changes: 3 additions & 0 deletions code/datums/emergency_calls/ert_stations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@

/datum/lazy_template/ert/weyland_station
map_name = "weyland_ert_station"

/datum/lazy_template/ert/pizza_station
map_name = "pizza_ert_station"
1 change: 1 addition & 0 deletions code/datums/emergency_calls/pizza.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
objectives = "Make sure you get a tip!"
shuttle_id = MOBILE_SHUTTLE_ID_ERT_SMALL
name_of_spawn = /obj/effect/landmark/ert_spawns/distress_pizza
home_base = /datum/lazy_template/ert/pizza_station
probability = 1

/datum/emergency_call/pizza/create_member(datum/mind/M, turf/override_spawn_loc)
Expand Down
4 changes: 4 additions & 0 deletions code/game/area/admin_level.dm
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@
name = "UPP Station"
icon_state = "green"

/area/adminlevel/ert_station/pizza_station
name = "Pizza Galaxy"
icon_state = "red"

/area/adminlevel/ert_station/clf_station
name = "CLF Station"
icon_state = "white"
Expand Down
8 changes: 8 additions & 0 deletions code/game/objects/structures/barricade/handrail.dm
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,11 @@

/obj/structure/barricade/handrail/sandstone/b
icon_state = "hr_sandstone_b"

/obj/structure/barricade/handrail/pizza
name = "\improper diner half-wall"
icon_state = "hr_sandstone" //temp, getting sprites soontm
color = "#b51c0b"
can_be_reinforced = FALSE
projectile_coverage = PROJECTILE_COVERAGE_LOW
layer = 4.1
13 changes: 12 additions & 1 deletion maps/templates/lazy_templates/clf_ert_station.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1378,6 +1378,17 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/dirt,
/area/adminlevel/ert_station/clf_station)
"Ia" = (
/obj/structure/bed/chair{
dir = 4
},
/obj/structure/machinery/power/apc/antag{
dir = 1
},
/turf/open/floor/wood{
icon_state = "wood-broken3"
},
/area/adminlevel/ert_station/clf_station)
"Ie" = (
/turf/open/gm/dirtgrassborder{
dir = 1;
Expand Down Expand Up @@ -3006,7 +3017,7 @@ zO
Ch
ZI
ZI
MQ
Ia
mw
mw
LQ
Expand Down
Loading
Loading