shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3907 from Citadel-Station-13/upstream-merge-32613

Browse Source 
[MIRROR]  Fixes cryo overlay system
This commit is contained in:
LetterJay
2017-11-13 11:50:23 -06:00
committed by GitHub
parent a21a5cf30d 96469050f4
commit bc23305ef9
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+21 -21
View File
@@ -18,8 +18,8 @@
var/volume = 100 var/volume = 100
var/efficiency = 1 var/efficiency = 1
var/sleep_factor = 750 var/sleep_factor = 0.00125
var/unconscious_factor = 1000 var/unconscious_factor = 0.001
var/heat_capacity = 20000 var/heat_capacity = 20000
var/conduction_coefficient = 0.3 var/conduction_coefficient = 0.3
@@ -94,29 +94,29 @@
if(occupant) if(occupant)
var/image/occupant_overlay var/image/occupant_overlay
if(ismonkey(occupant)) // Monkey
occupant_overlay = image(CRYOMOBS, "monkey")
occupant_overlay.copy_overlays(occupant)
else if(isalienadult(occupant))
if(isalienroyal(occupant)) // Queen and prae
occupant_overlay = image(CRYOMOBS, "alienq")
else if(isalienhunter(occupant)) // Hunter
occupant_overlay = image(CRYOMOBS, "alienh")
else if(isaliensentinel(occupant)) // Sentinel
occupant_overlay = image(CRYOMOBS, "aliens")
else // Drone or other
occupant_overlay = image(CRYOMOBS, "aliend")
else if(ishuman(occupant) || islarva(occupant) || (isanimal(occupant) && !ismegafauna(occupant))) // Mobs that are smaller than cryotube
occupant_overlay = image(occupant.icon, occupant.icon_state)
if(ishuman(occupant) || islarva(occupant) || (isanimal(occupant) && !ismegafauna(occupant))) // Mobs that are smaller than cryotube if(ishuman(occupant) || islarva(occupant) || (isanimal(occupant) && !ismegafauna(occupant))) // Mobs that are smaller than cryotube
occupant_overlay = image(occupant.icon, occupant.icon_state) occupant_overlay = image(occupant.icon, occupant.icon_state)
occupant_overlay.copy_overlays(occupant) occupant_overlay.copy_overlays(occupant)
else if(ismonkey(occupant)) // Monkey else
occupant_overlay = image(CRYOMOBS, "monkey")
occupant_overlay.copy_overlays(occupant)
else if(!isalienadult(occupant))
occupant_overlay = image(CRYOMOBS, "generic") occupant_overlay = image(CRYOMOBS, "generic")
else if(isalienroyal(occupant)) // Queen and prae
occupant_overlay = image(CRYOMOBS, "alienq")
else if(isalienhunter(occupant)) // Hunter
occupant_overlay = image(CRYOMOBS, "alienh")
else if(isaliensentinel(occupant)) // Sentinel
occupant_overlay = image(CRYOMOBS, "aliens")
else // Drone or other
occupant_overlay = image(CRYOMOBS, "aliend")
occupant_overlay.dir = SOUTH occupant_overlay.dir = SOUTH
occupant_overlay.pixel_y = 22 occupant_overlay.pixel_y = 22
@@ -182,8 +182,8 @@
if(air1.gases.len) if(air1.gases.len)
if(mob_occupant.bodytemperature < T0C) // Sleepytime. Why? More cryo magic. if(mob_occupant.bodytemperature < T0C) // Sleepytime. Why? More cryo magic.
mob_occupant.Sleeping((mob_occupant.bodytemperature / sleep_factor) * 2000) mob_occupant.Sleeping((mob_occupant.bodytemperature * sleep_factor) * 2000)
mob_occupant.Unconscious((mob_occupant.bodytemperature / unconscious_factor) * 2000) mob_occupant.Unconscious((mob_occupant.bodytemperature * unconscious_factor) * 2000)
if(beaker) if(beaker)
if(reagent_transfer == 0) // Magically transfer reagents. Because cryo magic. if(reagent_transfer == 0) // Magically transfer reagents. Because cryo magic.
beaker.reagents.trans_to(occupant, 1, 10 * efficiency) // Transfer reagents, multiplied because cryo magic. beaker.reagents.trans_to(occupant, 1, 10 * efficiency) // Transfer reagents, multiplied because cryo magic.