Merge pull request #11727 from PsiOmegaDelta/dev-freeze

Dev freeze
This commit is contained in:
PsiOmegaDelta
2015-12-22 11:25:38 +01:00
3 changed files with 5 additions and 1 deletions
@@ -17,6 +17,7 @@
var/temperature_resistance = 1000 + T0C
volume = 1000
use_power = 0
interact_offline = 1 // Allows this to be used when not in powered area.
var/release_log = ""
var/update_flag = 0
+3
View File
@@ -156,6 +156,9 @@
if(temp && !temp.is_usable())
user << "<span class='notice'>You try to move your [temp.name], but cannot!</span>"
return
if(!temp)
user << "<span class='notice'>You try to use your hand, but realize it is no longer attached!</span>"
return
src.pickup(user)
if (istype(src.loc, /obj/item/weapon/storage))
var/obj/item/weapon/storage/S = src.loc
+1 -1
View File
@@ -1278,7 +1278,7 @@
if(healths)
if (analgesic > 100)
healths.icon_state = "health_health_numb"
healths.icon_state = "health_numb"
else
switch(hal_screwyhud)
if(1) healths.icon_state = "health6"