mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-30 16:48:12 +01:00
[MIRROR] Fakedeath fixes (#12119)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
257679733a
commit
aa23225c9c
@@ -114,7 +114,7 @@
|
||||
is_hacking = 1
|
||||
// On average hackin takes ~15 seconds. Fairly small random span to discourage people from simply aborting and trying again
|
||||
// Reduced hack duration to compensate for the reduced functionality, multiplied by door sec level
|
||||
var/hack_result = do_after(user, (((10 SECONDS + rand(0, 10 SECONDS) + rand(0, 10 SECONDS))*hackspeed)*D.security_level))
|
||||
var/hack_result = do_after(user, (((10 SECONDS + rand(0, 10 SECONDS) + rand(0, 10 SECONDS))*hackspeed)*D.security_level), target = src)
|
||||
is_hacking = 0
|
||||
|
||||
if(hack_result && in_hack_mode)
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
user.show_message(dat, 1)
|
||||
return
|
||||
|
||||
var/fake_oxy = max(rand(1,40), M.getOxyLoss(), (300 - (M.getToxLoss() + M.getFireLoss() + M.getBruteLoss())))
|
||||
var/fake_oxy = max(M.getOxyLoss(), (300 - (M.getToxLoss() + M.getFireLoss() + M.getBruteLoss())))
|
||||
var/OX = M.getOxyLoss() > 50 ? span_bold("[M.getOxyLoss()]") : M.getOxyLoss()
|
||||
var/TX = M.getToxLoss() > 50 ? span_bold("[M.getToxLoss()]") : M.getToxLoss()
|
||||
var/BU = M.getFireLoss() > 50 ? span_bold("[M.getFireLoss()]") : M.getFireLoss()
|
||||
|
||||
@@ -140,7 +140,7 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
|
||||
|
||||
//Body status
|
||||
output += span_bold("Sleeve Status:") + " "
|
||||
if(H.status_flags |= FAKEDEATH)
|
||||
if(H.status_flags & FAKEDEATH)
|
||||
output += span_warning("Deceased") + "<br>"
|
||||
else
|
||||
switch(H.stat)
|
||||
|
||||
Reference in New Issue
Block a user