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

[MIRROR] Adds new landmark icons
2018-01-24 21:42:12 -06:00
parent eb7a4c005e 2e2f2c2017
commit c2df8bbacc
7 changed files with 39 additions and 6 deletions
--- a/code/modules/awaymissions/super_secret_room.dm
+++ b/code/modules/awaymissions/super_secret_room.dm
@@ -125,3 +125,4 @@

 /obj/effect/landmark/error
 	name = "error"
+	icon_state = "error_room"
--- a/code/modules/events/holiday/xmas.dm
+++ b/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