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

Merge branch 'master' into final_shuttle_touches_and_stuff

Browse Source 
# Conflicts:
#	icons/turf/shuttle.dmi
This commit is contained in:
alberyk
2022-01-17 22:20:15 -03:00
parent e92d839fbf 5bcf84cb23
commit 8cd6f9ca66
84 changed files with 2321 additions and 4654 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/landmarks.dm
+17 -1
View File
@@ -269,4 +269,20 @@
/obj/effect/landmark/force_spawnpoint/do_landmark_effect()
LAZYINITLIST(force_spawnpoints)
LAZYADD(force_spawnpoints[job_tag], loc)
LAZYADD(force_spawnpoints[job_tag], loc)
var/list/ruin_landmarks = list()
/obj/effect/landmark/ruin
var/datum/map_template/ruin/ruin_template
/obj/effect/landmark/ruin/New(loc, my_ruin_template)
name = "ruin_[sequential_id(/obj/effect/landmark/ruin)]"
..(loc)
ruin_template = my_ruin_template
ruin_landmarks |= src
/obj/effect/landmark/ruin/Destroy()
ruin_landmarks -= src
ruin_template = null
. = ..()