Merge remote-tracking branch 'upstream/master'

2024-10-28 22:21:26 -04:00
parent 117e5d8669 7fc23c7acf
commit f9ee168b6a
9 changed files with 110 additions and 14 deletions
@@ -8,6 +8,7 @@
 	category = EVENT_CATEGORY_ENTITIES
 	description = "Spawns a slaughter demon, to hunt by travelling through pools of blood."

+/*
 /datum/round_event_control/slaughter/canSpawnEvent()
 	weight = initial(src.weight)
 	var/list/allowed_turf_typecache = typecacheof(/turf/open) - typecacheof(/turf/open/space)
@@ -24,6 +25,7 @@
 		weight += 0.03
 		CHECK_TICK
 	return ..()
+*/

 /datum/round_event/ghost_role/slaughter
 	minimum_required = 1