cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BOX] The Great Bar/Kitchen Redesign (#20971)

Browse Source 
* e

* e

* e

* e

* e

* e

* e

* Revamps bar

* Kills bar templates

* Redesigns Bar/kitchen on box

* fixes compile errors

* compile bitch

* compile attempt 3

* changes some furniture

* compile you bitrch

* aaaaa

* decals

* movestheare b ack and fixes issues

* finishing up

* woops

* woops x2

* ok for real now

* there

* hmmm thats mnpt rogjt

* glass

* e

* e

* alarms

* fin

* eventspawner

* tweaks the kitchen layout

* fixes issues

* ktl's requests

* windowshutters are back

* bells (i didnt know these existed for bar/kitchen)

* chair

* e

* fix

* fix it for real

---------

Co-authored-by: azzzertyy <42524344+azzzertyy@users.noreply.github.com>
This commit is contained in:
Cark
2023-12-13 16:48:18 -08:00
committed by GitHub
parent 26ff5a9980
commit 04fb58a1a8
22 changed files with 2841 additions and 24762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
code/controllers/subsystem/job.dm
View File

@@ -606,8 +606,6 @@ SUBSYSTEM_DEF(job)
msgr.receiving = TRUE
if(SSevents.holidays && SSevents.holidays["St. Patrick's Day"])
irish_override() // Assuming direct control.
else if(living_mob.job == "Bartender")
job.give_bar_choice(living_mob, M)
else if(living_mob.job == "Clerk")
job.give_clerk_choice(living_mob, M)
else if(living_mob.job == "Chaplain")
@@ -688,71 +686,6 @@ SUBSYSTEM_DEF(job)
template.load(B.loc, centered = FALSE)
qdel(B)
/datum/controller/subsystem/job/proc/random_bar_init()
try
var/list/player_box = list()
for(var/mob/H in GLOB.player_list)
if(H.client && H.client.prefs) // Prefs was null once and there was no bar
player_box += H.client.prefs.read_preference(/datum/preference/choiced/bar_choice)
var/choice
if(player_box.len == 0)
choice = "Random"
else
choice = pick(player_box)
if(choice != "Random")
var/bar_sanitize = FALSE
for(var/A in GLOB.potential_box_bars)
if(choice == A)
bar_sanitize = TRUE
break
if(!bar_sanitize)
choice = "Random"
if(choice == "Random")
choice = pick(GLOB.potential_box_bars)
var/datum/map_template/template = SSmapping.station_room_templates[choice]
if(isnull(template))
message_admins("WARNING: BAR TEMPLATE [choice] FAILED TO LOAD! ATTEMPTING TO LOAD BACKUP")
log_game("WARNING: BAR TEMPLATE [choice] FAILED TO LOAD! ATTEMPTING TO LOAD BACKUP")
for(var/backup_bar in GLOB.potential_box_bars)
template = SSmapping.station_room_templates[backup_bar]
if(!isnull(template))
break
message_admins("WARNING: BAR TEMPLATE [backup_bar] FAILED TO LOAD! ATTEMPTING TO LOAD BACKUP")
log_game("WARNING: BAR TEMPLATE [backup_bar] FAILED TO LOAD! ATTEMPTING TO LOAD BACKUP")
if(isnull(template))
message_admins("WARNING: BAR RECOVERY FAILED! THERE WILL BE NO BAR FOR THIS ROUND!")
log_game("WARNING: BAR RECOVERY FAILED! THERE WILL BE NO BAR FOR THIS ROUND!")
return
for(var/obj/effect/landmark/stationroom/box/bar/B in GLOB.landmarks_list)
template.load(B.loc, centered = FALSE)
qdel(B)
catch(var/exception/e)
message_admins("RUNTIME IN RANDOM_BAR_INIT")
spawn_bar()
throw e
/proc/spawn_bar()
var/datum/map_template/template
for(var/backup_bar in GLOB.potential_box_bars)
template = SSmapping.station_room_templates[backup_bar]
if(!isnull(template))
break
if(isnull(template))
message_admins("UNABLE TO SPAWN BAR")
for(var/obj/effect/landmark/stationroom/box/bar/B in GLOB.landmarks_list)
template.load(B.loc, centered = FALSE)
qdel(B)
/datum/controller/subsystem/job/proc/random_clerk_init()
try
var/list/player_box = list()

5
code/controllers/subsystem/ticker.dm
View File

@@ -419,7 +419,6 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/proc/equip_characters()
var/captainless = TRUE
var/no_cyborgs = TRUE
var/no_bartender = TRUE
var/no_clerk = TRUE
var/no_chaplain = TRUE
@@ -430,8 +429,6 @@ SUBSYSTEM_DEF(ticker)
captainless = FALSE
if(player.mind.assigned_role == "Cyborg")
no_cyborgs = FALSE
if(player.mind.assigned_role == "Bartender")
no_bartender = FALSE
if(player.mind.assigned_role == "Clerk")
no_clerk = FALSE
if(player.mind.assigned_role == "Chaplain")
@@ -461,8 +458,6 @@ SUBSYSTEM_DEF(ticker)
to_chat(N, "<FONT color='red'>No Captain is present at the start of shift. Please follow the SOP available <b><a href='https://wiki.yogstation.net/wiki/Official:Disk_Procedure'>here</a></b> to secure the disk and assign an Acting Captain.")
CHECK_TICK
if(no_bartender && !(SSevents.holidays && SSevents.holidays["St. Patrick's Day"]))
SSjob.random_bar_init()
if(no_clerk)
SSjob.random_clerk_init()
if(no_chaplain)