From 1f80b80846b7c8d51619b1c79b9a386cf8a031ef Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Thu, 19 Dec 2024 05:20:28 +0300 Subject: [PATCH 1/6] Tweak window lights --- modular_ss220/events/code/christmas.dm | 39 ++++++++++++++++---------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/modular_ss220/events/code/christmas.dm b/modular_ss220/events/code/christmas.dm index eb5c059ca8c5..d822e804d973 100644 --- a/modular_ss220/events/code/christmas.dm +++ b/modular_ss220/events/code/christmas.dm @@ -115,18 +115,31 @@ GLOBAL_LIST_EMPTY(possible_gifts) unlimited = TRUE // Рождество +/datum/holiday/xmas + var/static/list/decorated_objects = typecacheof(list( + /obj/structure/window/full/basic, + /obj/structure/window/full/reinforced, + /obj/structure/window/full/plasmabasic, + /obj/structure/window/full/plasmareinforced, + )) + /datum/holiday/xmas/celebrate() // Новогоднее освещение for(var/obj/machinery/light/lights in GLOB.machines) lights.brightness_color = "#FFE6D9" lights.nightshift_light_color = "#FFC399" - // Гурлянды - 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/window in world) + if(is_type_in_typecache(window, decorated_objects)) + window.edge_overlay_file = 'modular_ss220/events/icons/xmaslights.dmi' + window.light_range = 4 + window.light_power = 0.1 + window.update_light() + for(var/turf/simulated/wall/indestructible/fakeglass/window in world) + window.edge_overlay_file = 'modular_ss220/events/icons/xmaslights.dmi' + window.light_range = 4 + window.light_power = 0.1 + window.update_light() // Новогодний цвет окон for(var/obj/structure/window/windows in world) windows.color = "#6CA66C" @@ -164,15 +177,11 @@ GLOBAL_LIST_EMPTY(possible_gifts) var/datum/supply_packs/misc/snow_machine/xmas = SSeconomy.supply_packs["[/datum/supply_packs/misc/snow_machine]"] xmas.special = FALSE -// Световые маски на гурлянды, красивое в темноте -/obj/structure/window/full/reinforced/update_overlays() +// Световые маски на гирлянды, красивое в темноте +/obj/structure/window/full/update_overlays() . = ..() - 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) + var/list/decorated_objects = /datum/holiday/xmas::decorated_objects + if((CHRISTMAS in SSholiday.holidays) && is_type_in_typecache(src, decorated_objects)) underlays += emissive_appearance(edge_overlay_file, "[smoothing_junction]_lightmask") /turf/simulated/wall/indestructible/fakeglass/update_overlays() From 9daa5ce0649b9e45c226f9044c24e535c0a6d261 Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Thu, 19 Dec 2024 05:20:56 +0300 Subject: [PATCH 2/6] Tweak xmas tree light --- modular_ss220/events/code/christmas.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modular_ss220/events/code/christmas.dm b/modular_ss220/events/code/christmas.dm index d822e804d973..81ab32ea2ae7 100644 --- a/modular_ss220/events/code/christmas.dm +++ b/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) From 0757851089a2880363cbc46837ec25802ae22688 Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Thu, 19 Dec 2024 06:14:48 +0300 Subject: [PATCH 3/6] Free gura --- modular_ss220/events/code/christmas.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_ss220/events/code/christmas.dm b/modular_ss220/events/code/christmas.dm index 81ab32ea2ae7..3f96ea4ab304 100644 --- a/modular_ss220/events/code/christmas.dm +++ b/modular_ss220/events/code/christmas.dm @@ -130,7 +130,7 @@ GLOBAL_LIST_EMPTY(possible_gifts) for(var/obj/machinery/light/lights in GLOB.machines) lights.brightness_color = "#FFE6D9" lights.nightshift_light_color = "#FFC399" - // Гирлянды + // Гурлянды for(var/obj/structure/window/full/window in world) if(is_type_in_typecache(window, decorated_objects)) window.edge_overlay_file = 'modular_ss220/events/icons/xmaslights.dmi' @@ -179,7 +179,7 @@ GLOBAL_LIST_EMPTY(possible_gifts) var/datum/supply_packs/misc/snow_machine/xmas = SSeconomy.supply_packs["[/datum/supply_packs/misc/snow_machine]"] xmas.special = FALSE -// Световые маски на гирлянды, красивое в темноте +// Световые маски на гурлянды, красивое в темноте /obj/structure/window/full/update_overlays() . = ..() var/list/decorated_objects = /datum/holiday/xmas::decorated_objects From eac9312dc9ff5f284a2f3b758f3b2e2291d16b22 Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Thu, 19 Dec 2024 06:51:30 +0300 Subject: [PATCH 4/6] No basic windows, my bad --- modular_ss220/events/code/christmas.dm | 62 ++++++++++++++++---------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/modular_ss220/events/code/christmas.dm b/modular_ss220/events/code/christmas.dm index 3f96ea4ab304..3727d0da8fa1 100644 --- a/modular_ss220/events/code/christmas.dm +++ b/modular_ss220/events/code/christmas.dm @@ -118,37 +118,44 @@ GLOBAL_LIST_EMPTY(possible_gifts) // Рождество /datum/holiday/xmas - var/static/list/decorated_objects = typecacheof(list( - /obj/structure/window/full/basic, - /obj/structure/window/full/reinforced, - /obj/structure/window/full/plasmabasic, - /obj/structure/window/full/plasmareinforced, - )) + 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/window in world) - if(is_type_in_typecache(window, decorated_objects)) - window.edge_overlay_file = 'modular_ss220/events/icons/xmaslights.dmi' - window.light_range = 4 - window.light_power = 0.1 - window.update_light() + 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 = 'modular_ss220/events/icons/xmaslights.dmi' - window.light_range = 4 - window.light_power = 0.1 + 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 @@ -158,32 +165,41 @@ 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' + // Новогодние цветочки (И снеговик) 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]"] xmas.special = FALSE // Световые маски на гурлянды, красивое в темноте -/obj/structure/window/full/update_overlays() +/obj/structure/window/full/reinforced/update_overlays() . = ..() - var/list/decorated_objects = /datum/holiday/xmas::decorated_objects - if((CHRISTMAS in SSholiday.holidays) && is_type_in_typecache(src, decorated_objects)) + 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) underlays += emissive_appearance(edge_overlay_file, "[smoothing_junction]_lightmask") /turf/simulated/wall/indestructible/fakeglass/update_overlays() From a77fc87a7a5b9df338b35caff2510028e0967757 Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Thu, 19 Dec 2024 06:54:13 +0300 Subject: [PATCH 5/6] Replace insipid windows with fancy ones --- _maps/map_files220/stations/boxstation.dmm | 40 +++++++++------------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm index c89c87bad02d..a559b0f6a858 100644 --- a/_maps/map_files220/stations/boxstation.dmm +++ b/_maps/map_files220/stations/boxstation.dmm @@ -11961,7 +11961,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aUX" = ( -/obj/effect/spawner/window/grilled, +/obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/engineering/dronefabricator) "aUY" = ( @@ -21131,7 +21131,7 @@ }, /area/station/engineering/hallway) "bHZ" = ( -/obj/effect/spawner/window/grilled, +/obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/engineering/emergency) "bIa" = ( @@ -30317,7 +30317,7 @@ /turf/simulated/floor/plating, /area/station/engineering/supermatter_room) "cvB" = ( -/obj/effect/spawner/window/grilled, +/obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/engineering/controlroom) "cvC" = ( @@ -37720,7 +37720,7 @@ }, /area/station/engineering/equipmentstorage) "cXL" = ( -/obj/effect/spawner/window/grilled, +/obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/engineering/equipmentstorage) "cXO" = ( @@ -43931,8 +43931,8 @@ /turf/simulated/floor/engine/n2, /area/station/engineering/atmos) "dKa" = ( -/obj/effect/spawner/window/grilled, /obj/structure/disposalpipe/segment, +/obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/engineering/emergency) "dKh" = ( @@ -47861,10 +47861,6 @@ /obj/structure/closet/secure_closet/research_reagents, /turf/simulated/floor/engine, /area/station/science/misc_lab) -"fjE" = ( -/obj/effect/spawner/window/grilled, -/turf/simulated/floor/plating, -/area/station/engineering/hallway) "fjM" = ( /obj/machinery/hydroponics/constructable{ desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; @@ -85936,10 +85932,6 @@ icon_state = "dark" }, /area/station/service/chapel) -"txJ" = ( -/obj/effect/spawner/window/grilled, -/turf/simulated/floor/plating, -/area/station/engineering/break_room) "txR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -128669,7 +128661,7 @@ cPo cOf cPo rJp -fjE +uZx cUw wWf cHk @@ -129440,15 +129432,15 @@ rdu qCi cQN cSq -fjE +uZx cUv cRP vaH -fjE +uZx cRe fqI -fjE -fjE +uZx +uZx vaH wZZ mmV @@ -129706,7 +129698,7 @@ dej cNX cTf iHT -fjE +uZx bQt cZU cRR @@ -129957,7 +129949,7 @@ aaa cOi csN cRS -fjE +uZx pNx cHT cNV @@ -130214,7 +130206,7 @@ aab uZx cQP cRV -fjE +uZx cUs mgd dac @@ -130477,7 +130469,7 @@ xdo dab mtc dbJ -fjE +uZx cQH hKe vBs @@ -130726,7 +130718,7 @@ ubo bPH aaa cPs -txJ +cPP gMc cHQ cHQ @@ -131762,7 +131754,7 @@ cHa iQt rzU dbL -txJ +cPP jZK dtv cOi From e8ec435a1c5cb98ecf1ac1f65a99383dc76f4207 Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Thu, 19 Dec 2024 16:00:19 +0300 Subject: [PATCH 6/6] Revert "Replace insipid windows with fancy ones" This reverts commit a77fc87a7a5b9df338b35caff2510028e0967757. --- _maps/map_files220/stations/boxstation.dmm | 40 +++++++++++++--------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm index a559b0f6a858..c89c87bad02d 100644 --- a/_maps/map_files220/stations/boxstation.dmm +++ b/_maps/map_files220/stations/boxstation.dmm @@ -11961,7 +11961,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aUX" = ( -/obj/effect/spawner/window/reinforced/grilled, +/obj/effect/spawner/window/grilled, /turf/simulated/floor/plating, /area/station/engineering/dronefabricator) "aUY" = ( @@ -21131,7 +21131,7 @@ }, /area/station/engineering/hallway) "bHZ" = ( -/obj/effect/spawner/window/reinforced/grilled, +/obj/effect/spawner/window/grilled, /turf/simulated/floor/plating, /area/station/engineering/emergency) "bIa" = ( @@ -30317,7 +30317,7 @@ /turf/simulated/floor/plating, /area/station/engineering/supermatter_room) "cvB" = ( -/obj/effect/spawner/window/reinforced/grilled, +/obj/effect/spawner/window/grilled, /turf/simulated/floor/plating, /area/station/engineering/controlroom) "cvC" = ( @@ -37720,7 +37720,7 @@ }, /area/station/engineering/equipmentstorage) "cXL" = ( -/obj/effect/spawner/window/reinforced/grilled, +/obj/effect/spawner/window/grilled, /turf/simulated/floor/plating, /area/station/engineering/equipmentstorage) "cXO" = ( @@ -43931,8 +43931,8 @@ /turf/simulated/floor/engine/n2, /area/station/engineering/atmos) "dKa" = ( +/obj/effect/spawner/window/grilled, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/engineering/emergency) "dKh" = ( @@ -47861,6 +47861,10 @@ /obj/structure/closet/secure_closet/research_reagents, /turf/simulated/floor/engine, /area/station/science/misc_lab) +"fjE" = ( +/obj/effect/spawner/window/grilled, +/turf/simulated/floor/plating, +/area/station/engineering/hallway) "fjM" = ( /obj/machinery/hydroponics/constructable{ desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; @@ -85932,6 +85936,10 @@ icon_state = "dark" }, /area/station/service/chapel) +"txJ" = ( +/obj/effect/spawner/window/grilled, +/turf/simulated/floor/plating, +/area/station/engineering/break_room) "txR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -128661,7 +128669,7 @@ cPo cOf cPo rJp -uZx +fjE cUw wWf cHk @@ -129432,15 +129440,15 @@ rdu qCi cQN cSq -uZx +fjE cUv cRP vaH -uZx +fjE cRe fqI -uZx -uZx +fjE +fjE vaH wZZ mmV @@ -129698,7 +129706,7 @@ dej cNX cTf iHT -uZx +fjE bQt cZU cRR @@ -129949,7 +129957,7 @@ aaa cOi csN cRS -uZx +fjE pNx cHT cNV @@ -130206,7 +130214,7 @@ aab uZx cQP cRV -uZx +fjE cUs mgd dac @@ -130469,7 +130477,7 @@ xdo dab mtc dbJ -uZx +fjE cQH hKe vBs @@ -130718,7 +130726,7 @@ ubo bPH aaa cPs -cPP +txJ gMc cHQ cHQ @@ -131754,7 +131762,7 @@ cHa iQt rzU dbL -cPP +txJ jZK dtv cOi