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

Lights turn on at roundstart #4129

Closed
wants to merge 12 commits into from
Closed

Lights turn on at roundstart #4129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c4caddf
Automatic changelog for PR #3470 [ci skip]
BeagleGaming1 Jun 20, 2023
19060a1
Merge branch 'master' of https://github.com/BeagleGaming1/cmss13
BeagleGaming1 Jun 20, 2023
8d5e539
Merge branch 'master' of https://github.com/BeagleGaming1/cmss13
BeagleGaming1 Jun 29, 2023
2f04a5f
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Jul 8, 2023
16fd442
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Jul 21, 2023
c438267
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Jul 23, 2023
6818bf0
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Jul 24, 2023
7d6ec07
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Jul 27, 2023
4ec92b2
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Aug 3, 2023
68d49d6
Merge branch 'cmss13-devs:master' into master
BeagleGaming1 Aug 5, 2023
bc953f5
lights
BeagleGaming1 Aug 7, 2023
4226380
tab
BeagleGaming1 Aug 7, 2023
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
4 changes: 4 additions & 0 deletions code/controllers/subsystem/ticker.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,10 @@ SUBSYSTEM_DEF(ticker)
INVOKE_ASYNC(C, TYPE_PROC_REF(/obj/structure/closet, select_gamemode_equipment), mode.type)
for(var/obj/structure/machinery/vending/V in machines)
INVOKE_ASYNC(V, TYPE_PROC_REF(/obj/structure/machinery/vending, select_gamemode_equipment), mode.type)
for(var/obj/structure/machinery/power/apc/apc in machines)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope this is the right place to put this

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be an SSticker.OnRoundstart()

if(!is_mainship_level(apc.z))
continue
addtimer(CALLBACK(apc, TYPE_PROC_REF(/obj/structure/machinery/power/apc, late_activation)), rand(4 SECONDS, 15 SECONDS))

SEND_GLOBAL_SIGNAL(COMSIG_GLOB_POST_SETUP)

Expand Down
7 changes: 7 additions & 0 deletions code/modules/power/apc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,18 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list(
update_icon()
addtimer(CALLBACK(src, PROC_REF(update)), 5)

if(is_mainship_level(z) && !(SSticker.current_state == GAME_STATE_PLAYING || SSticker.current_state == GAME_STATE_FINISHED))
operating = 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these should be FALSE/TRUE defines


start_processing()

if(!start_charge && is_ground_level(z) && prob(10))
set_broken()

/obj/structure/machinery/power/apc/proc/late_activation()
operating = 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as above

update()

/obj/structure/machinery/power/apc/set_pixel_location()
tdir = dir //To fix Vars bug
setDir(SOUTH)
Expand Down