Merge remote-tracking branch 'upstream/master' into nanites

code/game/gamemodes/dynamic/dynamic_rulesets_events.dm

@@ -478,6 +478,7 @@
 	//property_weights = list("extended" = 1)
 	//always_max_weight = TRUE
 	occurances_max = 0
+	map_blacklist = list("LayeniaStation.dmm")
 
 /datum/dynamic_ruleset/event/major_dust
 	name = "Major Space Dust"
@@ -493,6 +494,7 @@
 	repeatable = TRUE
 	//property_weights = list("extended" = 1)
 	occurances_max = 3
+	map_blacklist = list("LayeniaStation.dmm")
 	
 
 /datum/dynamic_ruleset/event/electrical_storm

code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm

@@ -770,8 +770,8 @@ datum/dynamic_ruleset/midround/bloodcult/trim_candidates()
 	name = "Space Ninja"
 	//config_tag = "ninja"
 	antag_flag = ROLE_NINJA
-	enemy_roles = list("Security Officer","Head of Security","Captain","AI","Cyborg")
-	required_enemies = list(3,2,2,2,2,1,1,1,1,0)
+	enemy_roles = list("Security Officer","Head of Security","Captain")
+	required_enemies = list(3,3,2,2,2,2,1,1,1,0)
 	required_candidates = 1
 	weight = 4
 	cost = 10

code/game/objects/effects/decals/cleanable/misc.dm

@@ -98,7 +98,7 @@
 	. = ..()
 	if(ismob(O))
 		radiate()
-		
+
 /obj/effect/decal/cleanable/greenglow/radioactive/proc/radiate()
 	if(!active)
 		if(world.time > last_event+15)
@@ -230,19 +230,19 @@
 	name = "generic glitter pile"
 	desc = "The herpes of arts and crafts."
 	icon = 'icons/effects/atmospherics.dmi'
+	icon_state = "glitter"
 	gender = NEUTER
 
 /obj/effect/decal/cleanable/glitter/pink
 	name = "pink glitter"
-	icon_state = "plasma_old"
+	color = "#9e0089"
 
 /obj/effect/decal/cleanable/glitter/white
 	name = "white glitter"
-	icon_state = "nitrous_oxide_old"
 
 /obj/effect/decal/cleanable/glitter/blue
 	name = "blue glitter"
-	icon_state = "freon_old"
+	color = "#2dd6ff"
 
 /obj/effect/decal/cleanable/plasma
 	name = "stabilized plasma"