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.

Sign up for GitHub

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

Jump to bottom

Pizza Station is back on the menu #5887

Merged
merged 16 commits into from
Mar 17, 2024
Merged

Pizza Station is back on the menu #5887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b9fa99f
Pizza ERT and Fixes
Nanu308 Feb 29, 2024
75191cc
Merge branch 'master' into nanu/pizza_ert_n_fixes
Nanu308 Mar 5, 2024
8062260
Pizza Time, detailing more and slight layout changes
Nanu308 Mar 5, 2024
9b0a3a6
Pizza Time
Nanu308 Mar 6, 2024
80a2f1f
Further Fixes
Nanu308 Mar 6, 2024
5706114
Merge branch 'master' into nanu/pizza_ert_n_fixes
Nanu308 Mar 6, 2024
c94a5b8
Pizza time Fixes Vica
Nanu308 Mar 7, 2024
07a0551
Merge branch 'master' into nanu/pizza_ert_n_fixes
Drulikar Mar 7, 2024
c9aae15
layer fixes
Nanu308 Mar 9, 2024
38e34de
Merge branch 'master' into nanu/pizza_ert_n_fixes
Nanu308 Mar 13, 2024
a33f515
Tweaks and Fixes, Subtype handrail
Nanu308 Mar 13, 2024
eaebe55
Merge branch 'master' into nanu/pizza_ert_n_fixes
Nanu308 Mar 14, 2024
33ce76a
cigarette vendor fix
Nanu308 Mar 14, 2024
3a1963e
Code Buckled Offset
Nanu308 Mar 15, 2024
db33c47
Offset for chairs buckling
Nanu308 Mar 15, 2024
9f3024c
Further Fixes
Nanu308 Mar 16, 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
3 changes: 3 additions & 0 deletions code/datums/emergency_calls/ert_stations.dm
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 = MOB_LAYER + 0.01
5 changes: 5 additions & 0 deletions code/game/objects/structures/stool_bed_chair_nest/bed.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
var/buildstackamount = 1
var/foldabletype //To fold into an item (e.g. roller bed item)
var/buckling_y = 0 //pixel y shift to give to the buckled mob.
var/buckling_x = 0 //pixel x shift to give to the buckled mob.
var/obj/structure/closet/bodybag/buckled_bodybag
var/accepts_bodybag = FALSE //Whether you can buckle bodybags to this bed
var/base_bed_icon //Used by beds that change sprite when something is buckled to them
Expand Down Expand Up @@ -60,11 +61,15 @@
if(. && buckled_mob == M)
M.pixel_y = buckling_y
M.old_y = buckling_y
M.pixel_x = buckling_x
M.old_x = buckling_x
if(base_bed_icon)
density = TRUE
else
M.pixel_y = initial(buckled_mob.pixel_y)
M.old_y = initial(buckled_mob.pixel_y)
M.pixel_x = initial(buckled_mob.pixel_x)
M.old_x = initial(buckled_mob.pixel_x)
if(base_bed_icon)
density = FALSE

Expand Down
2 changes: 0 additions & 2 deletions code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
var/mob/dead/observer/ghost_of_buckled_mob = null
var/hivenumber = XENO_HIVE_NORMAL
var/force_nest = FALSE
/// counterpart to buckling_y --> offsets the buckled mob when it buckles
var/list/buckling_x

/obj/structure/bed/nest/Initialize(mapload, hive)
. = ..()
Expand Down
13 changes: 12 additions & 1 deletion maps/templates/lazy_templates/clf_ert_station.dmm
View file
Open in desktop
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