Subsystem overruns (#18744)

* fix sun subsytem overrun

* .

* .

* night shift overrun

* .

* .

* this

* .

* .
This commit is contained in:
Kashargul
2025-11-26 17:42:55 +01:00
committed by GitHub
parent d51dcba221
commit 646d1faa11
7 changed files with 40 additions and 31 deletions
@@ -668,7 +668,7 @@
if(last_adrenaline_rush && last_adrenaline_rush + (30 MINUTES) > world.time)
return
last_adrenaline_rush = world.time
log_and_message_admins("[H]'s adrenaline rush trait just activated!")
log_and_message_admins("[H]'s adrenaline rush trait just activated!", H)
H.add_modifier(/datum/modifier/adrenaline, 30 SECONDS)
/datum/modifier/adrenaline
@@ -160,7 +160,7 @@
if(istype(target,/obj/item/trash))
user.visible_message(span_filter_notice("[user] nibbles away at \the [target.name]."), span_notice("You begin to nibble away at \the [target.name]..."))
busy = 1
if(do_after (user, 50))
if(do_after (user, 5 SECONDS, target))
user.visible_message(span_filter_notice("[user] finishes eating \the [target.name]."), span_notice("You finish eating \the [target.name]."))
to_chat(user, span_notice("You finish off \the [target.name]."))
qdel(target)
@@ -171,7 +171,7 @@
if(istype(target,/obj/item/cell))
user.visible_message(span_filter_notice("[user] begins cramming \the [target.name] down its throat."), span_notice("You begin cramming \the [target.name] down your throat..."))
busy = 1
if(do_after (user, 50))
if(do_after (user, 5 SECONDS, target))
user.visible_message(span_filter_notice("[user] finishes gulping down \the [target.name]."), span_notice("You finish swallowing \the [target.name]."))
to_chat(user, span_notice("You finish off \the [target.name], and gain some charge!"))
var/mob/living/silicon/robot/R = user
@@ -86,7 +86,7 @@ GLOBAL_VAR_INIT(security_level, 0)
SSatc.reroute_traffic(yes = 0)
spawn()
SSnightshift.check_nightshift()
SSnightshift.check_nightshift(TRUE)
admin_chat_message(message = "Security level is now: [uppertext(get_security_level())]", color = "#CC2222") //VOREStation Add
+1 -2
View File
@@ -75,8 +75,7 @@
trailing_newline = TRUE,
confidential = FALSE
)
//if(isnull(Master) || !SSchat?.initialized || !MC_RUNNING(SSchat.init_stage))
if(isnull(Master) || !SSchat?.initialized)
if(isnull(Master) || !SSchat?.initialized || !MC_RUNNING(SSchat.init_stage))
to_chat_immediate(target, html, type, text, avoid_highlighting)
return