mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
More runtime errors squashed.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@231 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -153,10 +153,11 @@
|
||||
// if(ticker.mode.name == "AI malfunction")
|
||||
// if(ticker.mode:malf_mode_declared)
|
||||
// stat(null, "Time left: [ ticker.mode:AI_win_timeleft]")
|
||||
if(emergency_shuttle.online && emergency_shuttle.location < 2)
|
||||
var/timeleft = emergency_shuttle.timeleft()
|
||||
if (timeleft)
|
||||
stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
|
||||
if(emergency_shuttle)
|
||||
if(emergency_shuttle.online && emergency_shuttle.location < 2)
|
||||
var/timeleft = emergency_shuttle.timeleft()
|
||||
if (timeleft)
|
||||
stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
|
||||
|
||||
if (src.client.statpanel == "Status")
|
||||
if (src.internal)
|
||||
@@ -1088,7 +1089,7 @@
|
||||
else
|
||||
stain_icon = icon('blood.dmi', "suitblood[!src.lying ? "" : "2"]")
|
||||
src.overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
|
||||
src.wear_suit.screen_loc = ui_oclothing
|
||||
src.wear_suit.screen_loc = ui_oclothing
|
||||
if (istype(src.wear_suit, /obj/item/clothing/suit/straight_jacket))
|
||||
if (src.handcuffed)
|
||||
src.handcuffed.loc = src.loc
|
||||
|
||||
@@ -250,6 +250,8 @@
|
||||
if(O2_pp < safe_oxygen_min) // Too little oxygen
|
||||
if(prob(20))
|
||||
spawn(0) emote("gasp")
|
||||
if (O2_pp == 0)
|
||||
O2_pp = 0.01
|
||||
var/ratio = safe_oxygen_min/O2_pp
|
||||
oxyloss += min(5*ratio, 7) // Don't fuck them up too fast (space only does 7 after all!)
|
||||
oxygen_used = breath.oxygen*ratio/6
|
||||
|
||||
@@ -29,8 +29,8 @@
|
||||
|
||||
/mob/living/carbon/monkey/movement_delay()
|
||||
var/tally = 0
|
||||
|
||||
if(src.reagents.has_reagent("hyperzine")) return -1
|
||||
if(src.reagents)
|
||||
if(src.reagents.has_reagent("hyperzine")) return -1
|
||||
|
||||
var/health_deficiency = (100 - src.health)
|
||||
if(health_deficiency >= 45) tally += (health_deficiency / 25)
|
||||
|
||||
Reference in New Issue
Block a user