Skip to content

Commit

Permalink
Pizza Station is back on the menu (#5887)
Browse files Browse the repository at this point in the history
# About the pull request
Adds a Pizza Galaxy space diner to the game for the Pizza ERT. They
deserve their own station as well!

The clothed tables will spawn incorrectly spritewise until Naut's PR
#5838 is added to the game.

Once new cooking sprites are added I'll go back and tweak the kitchen
area some more.

# Explain why it's good for the game
More Soulful lore and RP spots.

# Testing Photographs and Procedure

<details>
<summary>Screenshots & Videos</summary>


![bilde](https://github.com/cmss13-devs/cmss13/assets/59782240/d740b48b-a3bf-44ee-bc41-a2579ab32bd5)

</details>


# Changelog

:cl:
mapadd: Added the Galaxy Pizza Space Diner ERT station, for all your
outer expanse food needs!
maptweak: Placed APC's on ert stations and minor tweaks+fixes.
/:cl:

---------

Co-authored-by: Drathek <[email protected]>
  • Loading branch information
Nanu308 and Drulikar committed Mar 17, 2024
1 parent 23e0d5e commit 8e63a25
Show file tree
Hide file tree
Showing 10 changed files with 6,956 additions and 7 deletions.
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 = MOB_LAYER + 0.01
5 changes: 5 additions & 0 deletions code/game/objects/structures/stool_bed_chair_nest/bed.dm
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
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
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

0 comments on commit 8e63a25

Please sign in to comment.