cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 20:20:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

new station trait: hangover (#57525)

Browse Source
This commit is contained in:
Qustinnus
2021-03-08 16:23:03 -08:00
committed by GitHub
parent a700a42a20
commit 8095930906
13 changed files with 4227 additions and 1960 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/job.dm
+9 -2
View File
@@ -458,12 +458,19 @@ SUBSYSTEM_DEF(job)
if(!joined_late)
var/spawning_handled = FALSE
var/obj/S = null
if(HAS_TRAIT(SSstation, STATION_TRAIT_LATE_ARRIVALS))
if(HAS_TRAIT(SSstation, STATION_TRAIT_LATE_ARRIVALS) && job.random_spawns_possible)
SendToLateJoin(living_mob)
spawning_handled = TRUE
else if(HAS_TRAIT(SSstation, STATION_TRAIT_RANDOM_ARRIVALS))
else if(HAS_TRAIT(SSstation, STATION_TRAIT_RANDOM_ARRIVALS) && job.random_spawns_possible)
DropLandAtRandomHallwayPoint(living_mob)
spawning_handled = TRUE
else if(HAS_TRAIT(SSstation, STATION_TRAIT_HANGOVER) && job.random_spawns_possible)
for(var/obj/effect/landmark/start/hangover/hangover_spawn in GLOB.start_landmarks_list)
S = hangover_spawn
if(locate(/mob/living) in hangover_spawn.loc) //so we can revert to spawning them on top of eachother if something goes wrong
continue
hangover_spawn.used = TRUE
break
else if(length(GLOB.jobspawn_overrides[rank]))
S = pick(GLOB.jobspawn_overrides[rank])
else