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

Jump to bottom

Where the Fuck I am #1561

Merged
merged 10 commits into from
Sep 29, 2024
Merged

Where the Fuck I am #1561

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
28a9cda
Add: Darkness station trait
AyIong Sep 27, 2024
6005f7b
Cyberiad light switches
AyIong Sep 28, 2024
9d0ba4d
Delta light switches
AyIong Sep 28, 2024
0c392d6
Meta lol
AyIong Sep 28, 2024
7544ead
Merge branch 'master' into where-the-fuck-i-am
AyIong Sep 28, 2024
1543e3f
Fix linter
AyIong Sep 28, 2024
41ccd01
Update deltastation.dmm
AyIong Sep 28, 2024
17f2d0c
Update modular_ss220/station_traits/code/neutral_traits.dm
AyIong Sep 28, 2024
f117ba3
Ooops
AyIong Sep 29, 2024
65c9fee
Update modular_ss220/station_traits/_station_traits.dm
AyIong Sep 29, 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
1,279 changes: 839 additions & 440 deletions _maps/map_files220/stations/boxstation.dmm
View file
Open in desktop

Large diffs are not rendered by default.

2,878 changes: 1,642 additions & 1,236 deletions _maps/map_files220/stations/deltastation.dmm
View file
Open in desktop

Large diffs are not rendered by default.

206 changes: 116 additions & 90 deletions _maps/map_files220/stations/metastation.dmm
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion modular_ss220/maps220/code/Station/station_areas.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
/area/station/security/processing
request_console_name = "Security"

/area/station/security/restroom
name = "Комната отдыха Службы Безопасности"
AyIong marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "security"
request_console_name = "Security"

/area/mine/laborcamp
request_console_name = "Labor Camp"

Expand Down Expand Up @@ -46,7 +51,7 @@

/area/station/engineering/controlroom
request_console_name = "Engineering"

/area/station/engineering/dronefabricator
name = "Комната Изготовления Дронов"
icon_state = "engi"
Expand Down Expand Up @@ -98,6 +103,9 @@
/area/station/medical/virology
request_console_name = "Virology"

/area/station/medical/virology/test_room
name = "Тестовая Комната Вирусологии"

/area/station/medical/chemistry
request_console_name = "Chemistry"

Expand Down
1 change: 1 addition & 0 deletions modular_ss220/modular_ss220.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
#include "mobs/_mobs.dme"
#include "pixel_shift/_pixel_shift.dme"
#include "screentip_change/_screentip_change.dme"
#include "station_traits/_station_traits.dme"
#include "smart_equip_targeted/_smart_equip_targeted.dme"
#include "sm_space_drop/sm_space_drop.dme"
#include "text_to_speech/_tts.dme"
Expand Down
13 changes: 13 additions & 0 deletions modular_ss220/station_traits/_station_traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/datum/modpack/station_traits
name = "Station Traits"
desc = "Станционные трейты, которые добавили мы. Возможно в будущем будут на апстриме."
author = "Aylong"

/datum/modpack/station_traits/pre_initialize()
. = ..()

/datum/modpack/station_traits/initialize()
. = ..()

/datum/modpack/station_traits/post_initialize()
. = ..()
AyIong marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions modular_ss220/station_traits/_station_traits.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "_station_traits.dm"

#include "code/neutral_traits.dm"
29 changes: 29 additions & 0 deletions modular_ss220/station_traits/code/neutral_traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/datum/station_trait/darkness
name = "Экономия Света"
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
AyIong marked this conversation as resolved.
Show resolved Hide resolved
trait_type = STATION_TRAIT_NEUTRAL
weight = 5
show_in_report = TRUE
report_message = "Предыдущая смена позаботилась об экономии энергии перед уходом."
blacklist = list(/datum/station_trait/rave)
force = TRUE

/datum/station_trait/darkness/on_round_start()
. = ..()
for(var/obj/machinery/light_switch/light_switch in GLOB.machines)
var/turf/our_turf = get_turf(light_switch)
if(!is_station_level(our_turf.z))
continue

var/area/switch_area = get_area(light_switch)
switch_area.lightswitch = FALSE
light_switch.update_icon(UPDATE_ICON)

for(var/obj/machinery/light/light in switch_area)
light.power_change()

for(var/obj/item/flashlight/lamp/lamp in switch_area)
lamp.on = FALSE
lamp.update_brightness()

for(var/turf/simulated/floor/light/floor_light in switch_area)
floor_light.toggle_light(FALSE)
Loading