Merge remote-tracking branch 'origin/master' into semi-sync

2020-12-21 21:19:06 +08:00
parent 2966f985a3 ce3cfca619
commit abd94d1c03
189 changed files with 10453 additions and 8486 deletions
@@ -53,6 +53,9 @@
 		new festive_tree(get_turf(src))
 	return INITIALIZE_HINT_QDEL

+/obj/effect/landmark/xmastree/hilbert
+	christmas_tree = /obj/structure/flora/tree/pine/xmas
+
 /obj/effect/landmark/xmastree/rdrod
 	name = "festivus pole spawner"
 	festive_tree = /obj/structure/festivus
@@ -3,6 +3,7 @@
 	typepath = /datum/round_event/ghost_role/nightmare
 	max_occurrences = 1
 	min_players = 20
+	gamemode_blacklist = list("dynamic")

 /datum/round_event/ghost_role/nightmare
 	minimum_required = 1