cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 13:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Event Map Refactor (#12329)

Browse Source
This commit is contained in:
Geeves
2021-09-23 13:34:47 -03:00
committed by GitHub
parent 9a68ae6022
commit fdddb91bd1
16 changed files with 149 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/job.dm
+29 -23
View File
@@ -654,38 +654,44 @@
H.job = rank
if(job.latejoin_at_spawnpoints)
for (var/thing in landmarks_list)
var/obj/effect/landmark/L = thing
if(istype(L))
if(L.name == "LateJoin[rank]")
H.forceMove(L.loc)
return
if(current_map.force_spawnpoint && LAZYLEN(force_spawnpoints))
if(force_spawnpoints[rank])
H.forceMove(pick(force_spawnpoints[rank]))
else
H.forceMove(pick(force_spawnpoints["Anyone"]))
else
if(job.latejoin_at_spawnpoints)
for (var/thing in landmarks_list)
var/obj/effect/landmark/L = thing
if(istype(L))
if(L.name == "LateJoin[rank]")
H.forceMove(L.loc)
return
var/datum/spawnpoint/spawnpos
var/datum/spawnpoint/spawnpos
if(H.client.prefs.spawnpoint)
spawnpos = SSatlas.spawn_locations[H.client.prefs.spawnpoint]
if(H.client.prefs.spawnpoint)
spawnpos = SSatlas.spawn_locations[H.client.prefs.spawnpoint]
if(spawnpos && istype(spawnpos))
if(spawnpos.check_job_spawning(rank))
if(istype(spawnpos, /datum/spawnpoint/cryo) && (rank in command_positions))
var/datum/spawnpoint/cryo/C = spawnpos
if(length(C.command_turfs))
H.forceMove(pick(C.command_turfs))
if(spawnpos && istype(spawnpos))
if(spawnpos.check_job_spawning(rank))
if(istype(spawnpos, /datum/spawnpoint/cryo) && (rank in command_positions))
var/datum/spawnpoint/cryo/C = spawnpos
if(length(C.command_turfs))
H.forceMove(pick(C.command_turfs))
else
H.forceMove(pick(spawnpos.turfs))
else
H.forceMove(pick(spawnpos.turfs))
. = spawnpos.msg
spawnpos.after_join(H)
else
H.forceMove(pick(spawnpos.turfs))
. = spawnpos.msg
spawnpos.after_join(H)
to_chat(H, "Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead.")
H.forceMove(pick(latejoin))
. = "is inbound from the [current_map.dock_name]"
else
to_chat(H, "Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead.")
H.forceMove(pick(latejoin))
. = "is inbound from the [current_map.dock_name]"
else
H.forceMove(pick(latejoin))
. = "is inbound from the [current_map.dock_name]"
H.mind.selected_faction = SSjobs.GetFaction(H)