Skip to content

Commit

Permalink
Xmas aesthetics tweak (#1705)
Browse files Browse the repository at this point in the history
## Что этот PR делает
Подрубает мягкое свечение окнам с гирляндами.
Подрубает освещение елке.
~~Украшает гирляндами некоторые пропущенные окна на станции.~~
Заменяет часть окон на коробке для эстетики.

## Почему это хорошо для игры
Атмосфера +3

## Изображения изменений

<details>
<summary>Spoiler</summary

На всех скринах основное освещение почти выключено для контраста.

| До | После |
|--------|--------|
|
![1_dark](https://github.com/user-attachments/assets/3431937a-7b90-4c56-b195-ef567fb2311c)
|
![1_light](https://github.com/user-attachments/assets/43748526-03f4-454f-85e1-302b97f87420)
|
|
![2_dark](https://github.com/user-attachments/assets/3b7d5909-7f91-4f21-b9de-8e93eb299e9b)
|
![2_light](https://github.com/user-attachments/assets/9b92115d-5ce5-4ffd-be91-b1556fabfaf4)
|
|
![3_dark](https://github.com/user-attachments/assets/5a5a0aa7-9b63-41d5-9922-df67b42c45b1)
|
![3_light](https://github.com/user-attachments/assets/32c124e8-d5c4-4b85-a576-ec4c31d16ad1)
|
|
![4_dark](https://github.com/user-attachments/assets/d2d1732c-fe94-4f87-bb99-7779fe929d6f)
|
![4_light](https://github.com/user-attachments/assets/df2a7364-e6d1-43f2-bf9e-256aedce8a0c)
|

</details>


## Changelog

:cl: Maxiemar
tweak: Праздничный декор теперь светится.
tweak: Часть окон в инженерке Кибериады заменена на укрепленные.
/:cl:
  • Loading branch information
m-dzianishchyts authored Dec 19, 2024
1 parent eac7b06 commit d4d76a6
Showing 1 changed file with 39 additions and 12 deletions.
51 changes: 39 additions & 12 deletions modular_ss220/events/code/christmas.dm
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,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
Expand All @@ -143,23 +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)
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]"]
Expand All @@ -170,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)
Expand Down

0 comments on commit d4d76a6

Please sign in to comment.