Merge branch 'master' into giant_armored_seprentids

config/example/config.toml

@@ -1150,6 +1150,33 @@ tag = "blood_brothers"
 	"Solar Federation General",
 ]
 
+[[antag_mix_gamemode_configuration.antag_scenarios_configuration]]
+tag = "mindflayer"
+
+[antag_mix_gamemode_configuration.antag_scenarios_configuration.params]
+"required_players" = 1
+"cost" = 1
+"weight" = 1
+"antag_cap" = 1
+"candidates_required" = 1
+"restricted_roles" = ["Cyborg", "AI"]
+"protected_roles" = [
+	"Security Cadet",
+	"Security Officer",
+	"Warden",
+	"Detective",
+	"Head of Security",
+	"Captain",
+	"Blueshield",
+	"Nanotrasen Representative",
+	"Magistrate",
+	"Internal Affairs Agent",
+	"Nanotrasen Navy Officer",
+	"Special Operations Officer",
+	"Solar Federation General",
+]
+possible_species = ["Machine"]
+
 [[antag_mix_gamemode_configuration.antag_scenarios_configuration]]
 tag = "vox_raiders"
 

modular_ss220/antagonists/code/antag_mix/scenarios/minor_scenarios.dm

@@ -87,6 +87,36 @@
 		"Solar Federation General")
 	restricted_species = list("Machine")
 
+/datum/antag_scenario/mindflayer
+	name = "Mindflayer"
+	config_tag = "mindflayer"
+	abstract = FALSE
+	antag_role = ROLE_MIND_FLAYER
+	antag_special_role = SPECIAL_ROLE_MIND_FLAYER
+	antag_datum = /datum/antagonist/mindflayer
+	required_players = 1
+	cost = 10
+	weight = 1
+	antag_cap = 1
+	candidates_required = 1
+	restricted_roles = list("Cyborg", "AI")
+	protected_roles = list(
+		"Security Cadet",
+		"Security Officer",
+		"Warden",
+		"Detective",
+		"Head of Security",
+		"Captain",
+		"Blueshield",
+		"Nanotrasen Representative",
+		"Magistrate",
+		"Internal Affairs Agent",
+		"Nanotrasen Navy Officer",
+		"Special Operations Officer",
+		"Syndicate Officer",
+		"Solar Federation General")
+	possible_species = list("Machine")
+
 /datum/antag_scenario/team/blood_brothers
 	name = "Blood Brothers"
 	config_tag = "blood_brothers"

modular_ss220/events/code/christmas.dm

@@ -66,6 +66,8 @@ GLOBAL_LIST_EMPTY(possible_gifts)
 	desc = "Превосходная новогодняя ёлка."
 	icon = 'modular_ss220/events/icons/xmastree.dmi'
 	icon_state = "xmas_tree"
+	light_range = 6
+	light_power = 1
 	resistance_flags = INDESTRUCTIBLE // Protected by the christmas spirit
 
 /obj/structure/flora/tree/pine/xmas/Initialize(mapload)
@@ -115,25 +117,45 @@ GLOBAL_LIST_EMPTY(possible_gifts)
 	unlimited = TRUE
 
 // Рождество
+/datum/holiday/xmas
+	var/light_color = "#FFE6D9"
+	var/nightshift_light_color = "#FFC399"
+	var/window_edge_overlay_file = 'modular_ss220/events/icons/xmaslights.dmi'
+	var/window_light_range = 4
+	var/window_light_power = 0.1
+	var/window_color = "#6CA66C"
+
 /datum/holiday/xmas/celebrate()
 	// Новогоднее освещение
 	for(var/obj/machinery/light/lights in GLOB.machines)
-		lights.brightness_color = "#FFE6D9"
-		lights.nightshift_light_color = "#FFC399"
+		lights.brightness_color = light_color
+		lights.nightshift_light_color = nightshift_light_color
+
 	// Гурлянды
-	for(var/obj/structure/window/full/reinforced/rwindows in world)
-		rwindows.edge_overlay_file = 'modular_ss220/events/icons/xmaslights.dmi'
-	for(var/obj/structure/window/full/plasmareinforced/rplasma in world)
-		rplasma.edge_overlay_file = 'modular_ss220/events/icons/xmaslights.dmi'
-	for(var/turf/simulated/wall/indestructible/fakeglass/fakeglass in world)
-		fakeglass.edge_overlay_file = 'modular_ss220/events/icons/xmaslights.dmi'
+	for(var/obj/structure/window/full/reinforced/window in world)
+		window.edge_overlay_file = window_edge_overlay_file
+		window.light_range = window_light_range
+		window.light_power = window_light_power
+		window.update_light()
+	for(var/obj/structure/window/full/plasmareinforced/window in world)
+		window.edge_overlay_file = window_edge_overlay_file
+		window.light_range = window_light_range
+		window.light_power = window_light_power
+		window.update_light()
+	for(var/turf/simulated/wall/indestructible/fakeglass/window in world)
+		window.edge_overlay_file = window_edge_overlay_file
+		window.light_range = window_light_range
+		window.light_power = window_light_power
+		window.update_light()
+
 	// Новогодний цвет окон
 	for(var/obj/structure/window/windows in world)
-		windows.color = "#6CA66C"
+		windows.color = window_color
 	for(var/obj/machinery/door/window/windoor in world)
-		windoor.color = "#6CA66C"
+		windoor.color = window_color
 	for(var/turf/simulated/wall/indestructible/fakeglass/fakeglass in world)
-		fakeglass.color = "#6CA66C"
+		fakeglass.color = window_color
+
 	// Их не красить
 	for(var/obj/structure/window/full/plasmabasic/plasma in world)
 		plasma.color = null
@@ -143,22 +165,28 @@ GLOBAL_LIST_EMPTY(possible_gifts)
 		shuttle.color = null
 	for(var/obj/structure/window/full/plastitanium/syndie in world)
 		syndie.color = null
+
 	// Лучший подарок для лучшего экипажа
 	for(var/obj/structure/reagent_dispensers/beerkeg/nuke/beernuke in world)
 		beernuke.icon = 'modular_ss220/events/icons/nuclearbomb.dmi'
 	for(var/obj/machinery/nuclearbomb/nuke in world)
-		nuke.icon = 'modular_ss220/events/icons/nuclearbomb.dmi'
+		if(nuke.type == /obj/machinery/nuclearbomb)
+			nuke.icon = 'modular_ss220/events/icons/nuclearbomb.dmi'
+
 	// Новогодние цветочки (И снеговик)
 	for(var/obj/item/kirbyplants/plants in world)
 		plants.icon = 'modular_ss220/events/icons/xmas.dmi'
 		plants.icon_state = "plant-[rand(1,9)]"
+
 	// Шляпа Иану
 	for(var/mob/living/simple_animal/pet/dog/corgi/ian/Ian in GLOB.mob_list)
 		Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat)
+
 	// Снеговик в крафт
 	for(var/datum/crafting_recipe/snowman/S in GLOB.crafting_recipes)
 		S.always_available = TRUE
 		break
+
 	//The following spawn is necessary as both the timer and the shuttle systems initialise after the events system does, so we can't add stuff to the shuttle system as it doesn't exist yet and we can't use a timer
 	spawn(60 SECONDS)
 		var/datum/supply_packs/misc/snow_machine/xmas = SSeconomy.supply_packs["[/datum/supply_packs/misc/snow_machine]"]
@@ -169,7 +197,7 @@ GLOBAL_LIST_EMPTY(possible_gifts)
 	. = ..()
 	if(CHRISTMAS in SSholiday.holidays)
 		underlays += emissive_appearance(edge_overlay_file, "[smoothing_junction]_lightmask")
-		
+
 /obj/structure/window/full/plasmareinforced/update_overlays()
 	. = ..()
 	if(CHRISTMAS in SSholiday.holidays)