Merge pull request #9897 from PsiOmegaDelta/dev-freeze

Dev freeze
This commit is contained in:
PsiOmegaDelta
2015-06-22 16:57:51 +02:00
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -45,7 +45,7 @@
if(!T.implanted) continue
var/loc_display = "Unknown"
var/mob/living/carbon/M = T.imp_in
if(M.z in config.station_levels && !istype(M.loc, /turf/space))
if((M.z in config.station_levels) && !istype(M.loc, /turf/space))
var/turf/mob_loc = get_turf(M)
loc_display = mob_loc.loc
if(T.malfunction)
@@ -136,6 +136,7 @@
/obj/machinery/smartfridge/drying_rack/proc/dry()
for(var/obj/item/weapon/reagent_containers/food/snacks/S in contents)
if(S.dry) continue
if(S.dried_type == S.type)
S.dry = 1
item_quants[S.name]--