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

Show file tree
Hide file tree
Changes from 5 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
40 changes: 16 additions & 24 deletions _maps/map_files220/stations/boxstation.dmm
View file
Open in desktop
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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.";
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -128669,7 +128661,7 @@ cPo
cOf
cPo
rJp
fjE
uZx
cUw
wWf
cHk
Expand Down Expand Up @@ -129440,15 +129432,15 @@ rdu
qCi
cQN
cSq
fjE
uZx
cUv
cRP
vaH
fjE
uZx
cRe
fqI
fjE
fjE
uZx
uZx
vaH
wZZ
mmV
Expand Down Expand Up @@ -129706,7 +129698,7 @@ dej
cNX
cTf
iHT
fjE
uZx
bQt
cZU
cRR
Expand Down Expand Up @@ -129957,7 +129949,7 @@ aaa
cOi
csN
cRS
fjE
uZx
pNx
cHT
cNV
Expand Down Expand Up @@ -130214,7 +130206,7 @@ aab
uZx
cQP
cRV
fjE
uZx
cUs
mgd
dac
Expand Down Expand Up @@ -130477,7 +130469,7 @@ xdo
dab
mtc
dbJ
fjE
uZx
cQH
hKe
vBs
Expand Down Expand Up @@ -130726,7 +130718,7 @@ ubo
bPH
aaa
cPs
txJ
cPP
gMc
cHQ
cHQ
Expand Down Expand Up @@ -131762,7 +131754,7 @@ cHa
iQt
rzU
dbL
txJ
cPP
jZK
dtv
cOi
Expand Down
51 changes: 39 additions & 12 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,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

// Гурлянды
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/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,22 +165,27 @@ 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]"]
Expand All @@ -169,7 +196,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
Loading