Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Xmas aesthetics tweak #1705

Merged
merged 7 commits into from
Dec 19, 2024
Merged

Xmas aesthetics tweak #1705

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1f80b80
Tweak window lights
m-dzianishchyts Dec 19, 2024
9daa5ce
Tweak xmas tree light
m-dzianishchyts Dec 19, 2024
0757851
Free gura
m-dzianishchyts Dec 19, 2024
eac9312
No basic windows, my bad
m-dzianishchyts Dec 19, 2024
a77fc87
Replace insipid windows with fancy ones
m-dzianishchyts Dec 19, 2024
e8ec435
Revert "Replace insipid windows with fancy ones"
m-dzianishchyts Dec 19, 2024
a5333de
Merge remote-tracking branch 'origin/master' into xmas-aesthetics-tweak
m-dzianishchyts Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 26 additions & 15 deletions modular_ss220/events/code/christmas.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -115,18 +117,31 @@ GLOBAL_LIST_EMPTY(possible_gifts)
unlimited = TRUE

// Рождество
/datum/holiday/xmas
var/static/list/decorated_objects = typecacheof(list(
/obj/structure/window/full/basic,
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
/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"
// Гурлянды
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
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"
Expand Down Expand Up @@ -164,15 +179,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()
// Световые маски на гирлянды, красивое в темноте
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
/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()
Expand Down
Loading