Skip to content

Commit

Permalink
Merge pull request tgstation#41861 from 81Denton/nice
Browse files Browse the repository at this point in the history
Adds comments to landmarks
  • Loading branch information
optimumtact authored Dec 9, 2018
2 parents 6f03bba + 856e573 commit c11827f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 12 deletions.
14 changes: 7 additions & 7 deletions code/_globalvars/lists/mapping.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ GLOBAL_LIST_INIT(diagonals, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST))
GLOBAL_LIST_EMPTY(landmarks_list) //list of all landmarks created
GLOBAL_LIST_EMPTY(start_landmarks_list) //list of all spawn points created
GLOBAL_LIST_EMPTY(department_security_spawns) //list of all department security spawns
GLOBAL_LIST_EMPTY(generic_event_spawns) //list of all spawns for events
GLOBAL_LIST_EMPTY(jobspawn_overrides) //These will take precedence over normal spawnpoints if created.
GLOBAL_LIST_EMPTY(generic_event_spawns) //handles clockwork portal+eminence teleport destinations
GLOBAL_LIST_EMPTY(jobspawn_overrides) //These will take precedence over normal spawnpoints if created.

GLOBAL_LIST_EMPTY(wizardstart)
GLOBAL_LIST_EMPTY(nukeop_start)
GLOBAL_LIST_EMPTY(nukeop_leader_start)
GLOBAL_LIST_EMPTY(newplayer_start)
GLOBAL_LIST_EMPTY(prisonwarp) //prisoners go to these
GLOBAL_LIST_EMPTY(holdingfacility) //captured people go here
GLOBAL_LIST_EMPTY(xeno_spawn)//Aliens spawn at these.
GLOBAL_LIST_EMPTY(prisonwarp) //admin prisoners go to these
GLOBAL_LIST_EMPTY(holdingfacility) //captured people go here (ninja energy net)
GLOBAL_LIST_EMPTY(xeno_spawn)//aliens, morphs and nightmares spawn at these
GLOBAL_LIST_EMPTY(tdome1)
GLOBAL_LIST_EMPTY(tdome2)
GLOBAL_LIST_EMPTY(tdomeobserve)
GLOBAL_LIST_EMPTY(tdomeadmin)
GLOBAL_LIST_EMPTY(prisonwarped) //list of players already warped
GLOBAL_LIST_EMPTY(blobstart)
GLOBAL_LIST_EMPTY(secequipment)
GLOBAL_LIST_EMPTY(blobstart) //stationloving objects, blobs, santa, respawning devils
GLOBAL_LIST_EMPTY(secequipment) //sec equipment lockers that scale with the number of sec players
GLOBAL_LIST_EMPTY(deathsquadspawn)
GLOBAL_LIST_EMPTY(emergencyresponseteamspawn)
GLOBAL_LIST_EMPTY(servant_spawns) //Servants of Ratvar spawn here
Expand Down
16 changes: 11 additions & 5 deletions code/game/objects/effects/landmarks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
/obj/effect/landmark/start/depsec/science
name = "science_sec"

//Antagonist spawns

/obj/effect/landmark/start/wizard
name = "wizard"
icon = 'icons/effects/landmarks_static.dmi'
Expand Down Expand Up @@ -281,17 +283,17 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
SSjob.latejoin_trackers += loc
return INITIALIZE_HINT_QDEL

// carp.
//space carps, magicarps, lone ops, slaughter demons, possibly revenants spawn here
/obj/effect/landmark/carpspawn
name = "carpspawn"
icon_state = "carp_spawn"

// observer-start.
//observer start
/obj/effect/landmark/observer_start
name = "Observer-Start"
icon_state = "observer_start"

// xenos.
//xenos, morphs and nightmares spawn here
/obj/effect/landmark/xeno_spawn
name = "xeno_spawn"
icon_state = "xeno_spawn"
Expand All @@ -301,7 +303,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
GLOB.xeno_spawn += loc
return INITIALIZE_HINT_QDEL

// blobs.
//objects with the stationloving component (nuke disk) respawn here.
//also blobs that have their spawn forcemoved (running out of time when picking their spawn spot), santa and respawning devils
/obj/effect/landmark/blobstart
name = "blobstart"
icon_state = "blob_start"
Expand All @@ -311,6 +314,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
GLOB.blobstart += loc
return INITIALIZE_HINT_QDEL

//spawns sec equipment lockers depending on the number of sec officers
/obj/effect/landmark/secequipment
name = "secequipment"
icon_state = "secequipment"
Expand All @@ -320,6 +324,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
GLOB.secequipment += loc
return INITIALIZE_HINT_QDEL

//players that get put in admin jail show up here
/obj/effect/landmark/prisonwarp
name = "prisonwarp"
icon_state = "prisonwarp"
Expand All @@ -338,6 +343,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
GLOB.emergencyresponseteamspawn += loc
return INITIALIZE_HINT_QDEL

//ninja energy nets teleport victims here
/obj/effect/landmark/holding_facility
name = "Holding Facility"
icon_state = "holding_facility"
Expand Down Expand Up @@ -404,7 +410,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
GLOB.city_of_cogs_spawns += loc
return INITIALIZE_HINT_QDEL

//generic event spawns
//handles clockwork portal+eminence teleport destinations
/obj/effect/landmark/event_spawn
name = "generic event spawn"
icon_state = "generic_event"
Expand Down

0 comments on commit c11827f

Please sign in to comment.