cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 07:20:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Additional spawnpoint work (#19061)

Browse Source 
Fixed some latejoin spawnpoints that were not working (eg. borgs).
Runtime map now uses proper spawnpoints instead of forced ones.
Moved and DMDoc'd force spawnpoints.

After a quick testmerge (because I don't trust spawnpoints at all), this
should be good to go in
This commit is contained in:
Fluffy
2024-04-30 05:58:04 +00:00
committed by GitHub
parent 8b19ce7675
commit 8e54105080
5 changed files with 369 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/landmarks.dm
+19 -12
View File
@@ -126,6 +126,25 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/lobby_mobs_location)
return INITIALIZE_HINT_QDEL
/**
* # Force spawnpoint
*
* A spawnpoint that is forced to be used at spawn (join AND latejoin), *overriding everything else*, depending on the `job_tag` var
*
* If the `job_tag` is set to "Anyone", the spawnpoint will be used for all jobs
*/
/obj/effect/landmark/force_spawnpoint
name = "force spawnpoint"
var/job_tag = "Anyone"
/obj/effect/landmark/force_spawnpoint/Initialize()
. = ..()
LAZYADD(GLOB.force_spawnpoints[job_tag], get_turf(src))
/obj/effect/landmark/force_spawnpoint/Destroy()
LAZYREMOVE(GLOB.force_spawnpoints[job_tag], get_turf(src))
. = ..()
/**
* # Skrell SROM (dreaming) marker
*
@@ -190,18 +209,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/lobby_mobs_location)
/obj/effect/landmark/distress_team_equipment
name = "distress equipment"
/obj/effect/landmark/force_spawnpoint
name = "force spawnpoint"
var/job_tag = "Anyone"
/obj/effect/landmark/force_spawnpoint/Initialize()
. = ..()
LAZYADD(GLOB.force_spawnpoints[job_tag], get_turf(src))
/obj/effect/landmark/force_spawnpoint/Destroy()
LAZYREMOVE(GLOB.force_spawnpoints[job_tag], get_turf(src))
. = ..()
/obj/effect/landmark/ruin
var/datum/map_template/ruin/ruin_template