mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 20:45:28 +01:00
Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-25-04a
This commit is contained in:
@@ -987,6 +987,30 @@
|
||||
return stored_files
|
||||
return stored_files + inserted_disk.stored_files
|
||||
|
||||
/// Returns how relevant the current security level is:
|
||||
#define ALERT_RELEVANCY_SAFE 0 /// * 0: User is not in immediate danger and not needed for some station-critical task.
|
||||
#define ALERT_RELEVANCY_WARN 1 /// * 1: Danger is around, but the user is not directly needed to handle it.
|
||||
#define ALERT_RELEVANCY_PERTINENT 2/// * 2: Danger is around and the user is responsible for handling it.
|
||||
/obj/item/modular_computer/proc/get_security_level_relevancy()
|
||||
switch(SSsecurity_level.get_current_level_as_number())
|
||||
if(SEC_LEVEL_DELTA)
|
||||
return ALERT_RELEVANCY_PERTINENT
|
||||
if(SEC_LEVEL_RED) // all-hands-on-deck situations, everyone is responsible for combatting a threat
|
||||
return ALERT_RELEVANCY_PERTINENT
|
||||
if(SEC_LEVEL_BLUE) // suspected threat. security needs to be alert and possibly preparing for it, no further concerns
|
||||
if(ACCESS_SECURITY in computer_id_slot.access)
|
||||
return ALERT_RELEVANCY_PERTINENT
|
||||
else
|
||||
return ALERT_RELEVANCY_WARN
|
||||
if(SEC_LEVEL_GREEN) // no threats, no concerns
|
||||
return ALERT_RELEVANCY_SAFE
|
||||
|
||||
return 0
|
||||
|
||||
#undef ALERT_RELEVANCY_SAFE
|
||||
#undef ALERT_RELEVANCY_WARN
|
||||
#undef ALERT_RELEVANCY_PERTINENT
|
||||
|
||||
/**
|
||||
* Debug ModPC
|
||||
* Used to spawn all programs for Create and Destroy unit test.
|
||||
|
||||
@@ -120,6 +120,10 @@
|
||||
"alert" = program.alert_pending,
|
||||
))
|
||||
|
||||
data["alert_style"] = get_security_level_relevancy()
|
||||
data["alert_color"] = SSsecurity_level?.current_security_level?.announcement_color
|
||||
data["alert_name"] = SSsecurity_level?.current_security_level?.name_shortform
|
||||
|
||||
return data
|
||||
|
||||
// Handles user's GUI input
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
looping_sound = FALSE
|
||||
|
||||
shell_capacity = SHELL_CAPACITY_SMALL
|
||||
action_slots = ALL
|
||||
|
||||
///The item currently inserted into the PDA, starts with a pen.
|
||||
var/obj/item/inserted_item = /obj/item/pen
|
||||
|
||||
Reference in New Issue
Block a user