cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-27 10:15:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

manual merge

Browse Source
This commit is contained in:
LetterJay
2017-05-02 08:40:10 -05:00
parent 08a01aa11b
commit f7fe20887a
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/controllers/subsystem/ticker.dm
View File

@@ -672,6 +672,12 @@ SUBSYSTEM_DEF(ticker)
return return
INVOKE_ASYNC(SSmapping, /datum/controller/subsystem/mapping/.proc/maprotate) INVOKE_ASYNC(SSmapping, /datum/controller/subsystem/mapping/.proc/maprotate)
/datum/controller/subsystem/ticker/proc/HasRoundStarted()
return current_state >= GAME_STATE_PLAYING
/datum/controller/subsystem/ticker/proc/IsRoundInProgress()
return current_state == GAME_STATE_PLAYING
/proc/send_gamemode_vote() /proc/send_gamemode_vote()
SSticker.modevoted = TRUE SSticker.modevoted = TRUE
SSvote.initiate_vote("roundtype","server") SSvote.initiate_vote("roundtype","server")

2
code/modules/power/singularity/emitter.dm
View File

@@ -96,7 +96,7 @@
sparks.set_up(5, TRUE, src) sparks.set_up(5, TRUE, src)
/obj/machinery/power/emitter/Destroy() /obj/machinery/power/emitter/Destroy()
if(SSticker && SSticker.current_state == GAME_STATE_PLAYING) if(SSticker && SSticker.IsRoundInProgress())
message_admins("Emitter deleted at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1) message_admins("Emitter deleted at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
log_game("Emitter deleted at ([x],[y],[z])") log_game("Emitter deleted at ([x],[y],[z])")
investigate_log("<font color='red'>deleted</font> at ([x],[y],[z]) at [get_area(src)]","singulo") investigate_log("<font color='red'>deleted</font> at ([x],[y],[z]) at [get_area(src)]","singulo")