This commit is contained in:
Azarak
2020-10-15 22:06:05 +01:00
committed by GitHub
parent 96343528ef
commit 0a3ea7114e
8 changed files with 69 additions and 1 deletions
@@ -376,7 +376,8 @@
if(!key)
msg += "<span class='deadsay'>[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.</span>\n"
else if(!client)
msg += "[t_He] [t_has] a blank, absent-minded stare and appears completely unresponsive to anything. [t_He] may snap out of it soon.\n"
//msg += "[t_He] [t_has] a blank, absent-minded stare and appears completely unresponsive to anything. [t_He] may snap out of it soon.\n" //ORIGINAL
msg += "[t_He] [t_has] a blank, absent-minded stare and [t_has] been completely unresponsive to anything for [round(((world.time - lastclienttime) / (1 MINUTES)),1)] minutes. [t_He] may snap out of it soon.\n" //SKYRAT CHANGE ADDITION - SSD_INDICATOR
var/scar_severity = 0
for(var/i in all_scars)
+3
View File
@@ -4,3 +4,6 @@ ALERT_ORANGE_UPTO A major engineering emergency has developed. Non-engineering p
ALERT_ORANGE_DOWNTO A major engineering emergency has developed. Non-engineering personnel are required to evacuate any affected areas and obey relevant instructions from engineering staff.
ALERT_VIOLET_UPTO A major medical emergency has developed. Non-medical personnel are required to obey all relevant instructions from medical staff.
ALERT_VIOLET_DOWNTO A major medical emergency has developed. Non-medical personnel are required to obey all relevant instructions from medical staff.
## How long until someone can be put in cryo if they are SSD
CRYO_MIN_SSD_TIME 15
@@ -0,0 +1,2 @@
/datum/config_entry/number/cryo_min_ssd_time
config_entry_value = 15
@@ -439,6 +439,9 @@
else if(target.client)
if(alert(target,"Would you like to enter cryosleep?",,"Yes","No") == "No")
return
if (user != target && round(((world.time - target.lastclienttime) / (1 MINUTES)),1) <= CONFIG_GET(number/cryo_min_ssd_time))
to_chat(user, "<span class='danger'>You can't put [target] into [src]. They might wake up soon.</span>")
return
var/generic_plsnoleave_message = " Please adminhelp before leaving the round, even if there are no administrators online!"
if(target == user && world.time - target.client.cryo_warned > 5 MINUTES)//if we haven't warned them in the last 5 minutes
var/list/caught_string
@@ -0,0 +1,30 @@
GLOBAL_VAR_INIT(ssd_indicator_overlay, mutable_appearance('modular_skyrat/modules/ssd_indicator/icons/ssd_indicator.dmi', "default0", FLY_LAYER))
/mob/living
var/ssd_indicator = FALSE
var/lastclienttime = 0
/mob/living/proc/set_ssd_indicator(var/state)
if(state == ssd_indicator)
return
ssd_indicator = state
if(ssd_indicator)
add_overlay(GLOB.ssd_indicator_overlay)
else
cut_overlay(GLOB.ssd_indicator_overlay)
/mob/living/Login()
. = ..()
set_ssd_indicator(FALSE)
/mob/living/Logout()
lastclienttime = world.time
set_ssd_indicator(TRUE)
/*
//EDIT - TRANSFER CKEY IS NOT A THING ON THE TG CODEBASE, if things break too bad because of it, consider implementing it
//This proc should stop mobs from having the overlay when someone keeps jumping control of mobs, unfortunately it causes Aghosts to have their character without the SSD overlay, I wasn't able to find a better proc unfortunately
/mob/living/transfer_ckey(mob/new_mob, send_signal = TRUE)
..()
set_ssd_indicator(FALSE)
*/
Binary file not shown.

After

Width:  |  Height:  |  Size: 311 B

@@ -0,0 +1,27 @@
## Title: SSD indicator
MODULE ID: SSD_INDICATOR
### Description:
Shows a green "ZZZ" on people that are SSD, records when they went SSD and shows that as time on examine. Also uses that variable for cryosleep threshold
### TG Proc Changes:
./code/modules/mob/living/carbon/human/examine.dm > /mob/living/carbon/human/examine()
### Defines:
- N/A
### Master file additions
- N/A
### Included files that are not contained in this module:
- N/A
### Credits:
Azarak - original code & porting
+2
View File
@@ -3302,6 +3302,7 @@
#include "modular_skyrat\modules\blueshield\code\modules\jobs\job_types\blueshield.dm"
#include "modular_skyrat\modules\blueshield\code\modules\projectiles\guns\energy\special.dm"
#include "modular_skyrat\modules\cryosleep\code\ai.dm"
#include "modular_skyrat\modules\cryosleep\code\config.dm"
#include "modular_skyrat\modules\cryosleep\code\cryopod.dm"
#include "modular_skyrat\modules\cryosleep\code\job.dm"
#include "modular_skyrat\modules\customization\__DEFINES\augment.dm"
@@ -3474,6 +3475,7 @@
#include "modular_skyrat\modules\pixel_shift\code\pixel_shift.dm"
#include "modular_skyrat\modules\radiosound\code\game\objects\items\devices\radio\headset.dm"
#include "modular_skyrat\modules\SiliconQoL\code\_onclick.dm"
#include "modular_skyrat\modules\ssd_indicator\code\mob.dm"
#include "modular_skyrat\modules\typing_indicator\code\mob.dm"
#include "modular_skyrat\modules\verbs\code\modules\client\preferences_toggles.dm"
#include "modular_skyrat\modules\verbs\code\modules\client\verbs\looc.dm"