Merge pull request #5087 from Citadel-Station-13/upstream-merge-34848

[MIRROR] Adds new landmark icons

code/__DEFINES/layers.dm

@@ -65,6 +65,9 @@
 #define RIPPLE_LAYER 5.1
 
 #define GHOST_LAYER 6
+#define LOW_LANDMARK_LAYER 9
+#define MID_LANDMARK_LAYER 9.1
+#define HIGH_LANDMARK_LAYER 9.2
 #define AREA_LAYER 10
 #define MASSIVE_OBJ_LAYER 11
 #define POINT_LAYER 12

code/game/gamemodes/miniantags/abduction/abduction.dm

@@ -6,7 +6,9 @@
 	var/team_number = 1
 
 /obj/effect/landmark/abductor/agent
+	icon_state = "abductor_agent"
 /obj/effect/landmark/abductor/scientist
+	icon_state = "abductor"
 
 // OBJECTIVES
 /datum/objective/experiment

code/game/objects/effects/landmarks.dm

@@ -1,8 +1,9 @@
 /obj/effect/landmark
 	name = "landmark"
-	icon = 'icons/mob/screen_gen.dmi'
+	icon = 'icons/effects/landmarks_static.dmi'
 	icon_state = "x2"
 	anchored = TRUE
+	layer = MID_LANDMARK_LAYER
 	invisibility = INVISIBILITY_ABSTRACT
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 
@@ -31,6 +32,7 @@
 	icon = 'icons/mob/landmarks.dmi'
 	icon_state = "x"
 	anchored = TRUE
+	layer = MOB_LAYER
 	var/jobspawn_override = FALSE
 	var/delete_after_roundstart = TRUE
 
@@ -214,6 +216,8 @@
 
 /obj/effect/landmark/start/wizard
 	name = "wizard"
+	icon = 'icons/effects/landmarks_static.dmi'
+	icon_state = "wiznerd_spawn"
 
 /obj/effect/landmark/start/wizard/Initialize()
 	..()
@@ -222,6 +226,8 @@
 
 /obj/effect/landmark/start/nukeop
 	name = "nukeop"
+	icon = 'icons/effects/landmarks_static.dmi'
+	icon_state = "snukeop_spawn"
 
 /obj/effect/landmark/start/nukeop/Initialize()
 	..()
@@ -230,6 +236,8 @@
 
 /obj/effect/landmark/start/nukeop_leader
 	name = "nukeop leader"
+	icon = 'icons/effects/landmarks_static.dmi'
+	icon_state = "snukeop_leader_spawn"
 
 /obj/effect/landmark/start/nukeop_leader/Initialize()
 	..()
@@ -259,6 +267,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 // carp.
 /obj/effect/landmark/carpspawn
 	name = "carpspawn"
+	icon_state = "carp_spawn"
 
 // lightsout.
 /obj/effect/landmark/lightsout
@@ -267,18 +276,23 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 // observer-start.
 /obj/effect/landmark/observer_start
 	name = "Observer-Start"
+	icon_state = "observer_start"
 
 // revenant spawn.
 /obj/effect/landmark/revenantspawn
 	name = "revnantspawn"
+	icon_state = "revenant_spawn"
 
 // triple ais.
 /obj/effect/landmark/tripai
 	name = "tripai"
+	icon_state = "ai_spawn"
+	layer = MOB_LAYER
 
 // xenos.
 /obj/effect/landmark/xeno_spawn
 	name = "xeno_spawn"
+	icon_state = "xeno_spawn"
 
 /obj/effect/landmark/xeno_spawn/Initialize(mapload)
 	..()
@@ -288,6 +302,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 // blobs.
 /obj/effect/landmark/blobstart
 	name = "blobstart"
+	icon_state = "blob_start"
 
 /obj/effect/landmark/blobstart/Initialize(mapload)
 	..()
@@ -296,6 +311,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 
 /obj/effect/landmark/secequipment
 	name = "secequipment"
+	icon_state = "secequipment"
 
 /obj/effect/landmark/secequipment/Initialize(mapload)
 	..()
@@ -304,6 +320,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 
 /obj/effect/landmark/prisonwarp
 	name = "prisonwarp"
+	icon_state = "prisonwarp"
 
 /obj/effect/landmark/prisonwarp/Initialize(mapload)
 	..()
@@ -312,6 +329,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 
 /obj/effect/landmark/ert_spawn
 	name = "Emergencyresponseteam"
+	icon_state = "ert_spawn"
 
 /obj/effect/landmark/ert_spawn/Initialize(mapload)
 	..()
@@ -320,6 +338,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 
 /obj/effect/landmark/holding_facility
 	name = "Holding Facility"
+	icon_state = "holding_facility"
 
 /obj/effect/landmark/holding_facility/Initialize(mapload)
 	..()
@@ -328,6 +347,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 
 /obj/effect/landmark/thunderdome/observe
 	name = "tdomeobserve"
+	icon_state = "tdome_observer"
 
 /obj/effect/landmark/thunderdome/observe/Initialize(mapload)
 	..()
@@ -336,6 +356,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 
 /obj/effect/landmark/thunderdome/one
 	name = "tdome1"
+	icon_state = "tdome_t1"
 
 /obj/effect/landmark/thunderdome/one/Initialize(mapload)
 	..()
@@ -344,6 +365,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 
 /obj/effect/landmark/thunderdome/two
 	name = "tdome2"
+	icon_state = "tdome_t2"
 
 /obj/effect/landmark/thunderdome/two/Initialize(mapload)
 	..()
@@ -352,6 +374,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 
 /obj/effect/landmark/thunderdome/admin
 	name = "tdomeadmin"
+	icon_state = "tdome_admin"
 
 /obj/effect/landmark/thunderdome/admin/Initialize(mapload)
 	..()
@@ -361,6 +384,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 //Servant spawn locations
 /obj/effect/landmark/servant_of_ratvar
 	name = "servant of ratvar spawn"
+	icon_state = "clockwork_orange"
+	layer = MOB_LAYER
 
 /obj/effect/landmark/servant_of_ratvar/Initialize(mapload)
 	..()
@@ -370,7 +395,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 //City of Cogs entrances
 /obj/effect/landmark/city_of_cogs
 	name = "city of cogs entrance"
-	icon_state = "x4"
+	icon_state = "city_of_cogs"
 
 /obj/effect/landmark/city_of_cogs/Initialize(mapload)
 	..()
@@ -380,7 +405,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 //generic event spawns
 /obj/effect/landmark/event_spawn
 	name = "generic event spawn"
-	icon_state = "x4"
+	icon_state = "generic_event"
+	layer = HIGH_LANDMARK_LAYER
 
 
 /obj/effect/landmark/event_spawn/New()

code/game/objects/effects/spawners/lootdrop.dm

@@ -1,7 +1,7 @@
 /obj/effect/spawner/lootdrop
-	icon = 'icons/mob/screen_gen.dmi'
-	icon_state = "x2"
-	color = "#00FF00"
+	icon = 'icons/effects/landmarks_static.dmi'
+	icon_state = "random_loot"
+	layer = OBJ_LAYER
 	var/lootcount = 1		//how many items will be spawned
 	var/lootdoubles = TRUE	//if the same item can be spawned twice
 	var/list/loot			//a list of possible items to spawn e.g. list(/obj/item, /obj/structure, /obj/effect)

code/modules/awaymissions/super_secret_room.dm

@@ -125,3 +125,4 @@
 
 /obj/effect/landmark/error
 	name = "error"
+	icon_state = "error_room"

code/modules/events/holiday/xmas.dm

@@ -41,6 +41,7 @@
 
 /obj/effect/landmark/xmastree
 	name = "christmas tree spawner"
+	layer = FLY_LAYER
 	var/festive_tree = /obj/structure/flora/tree/pine/xmas
 	var/christmas_tree = /obj/structure/flora/tree/pine/xmas/presents