Merge pull request #5941 from Whitellama/master

Fixes #5577, Dionaea crashing on death. Fixes #5838, tomes not being able to be stored on bookshelves."
This commit is contained in:
Ccomp5950
2014-08-10 18:53:11 -05:00
10 changed files with 91 additions and 75 deletions

View File

@@ -842,18 +842,18 @@ datum
description = "Sterilizes wounds in preparation for surgery."
reagent_state = LIQUID
color = "#C8A5DC" // rgb: 200, 165, 220
//makes you squeaky clean
reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
if (method == TOUCH)
M.germ_level -= min(volume*20, M.germ_level)
reaction_obj(var/obj/O, var/volume)
O.germ_level -= min(volume*20, O.germ_level)
reaction_turf(var/turf/T, var/volume)
T.germ_level -= min(volume*20, T.germ_level)
/* reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
src = null
if (method==TOUCH)
@@ -1332,7 +1332,7 @@ datum
if(!M) M = holder.my_atom
if(ishuman(M))
var/mob/living/carbon/human/H = M
//Peridaxon is hard enough to get, it's probably fair to make this all internal organs
for(var/datum/organ/internal/I in H.internal_organs)
if(I.damage > 0)
@@ -3073,6 +3073,9 @@ datum
paperaffected.clearpaper()
usr << "The solution dissolves the ink on the paper."
if(istype(O,/obj/item/weapon/book))
if(istype(O,/obj/item/weapon/book/tome))
usr << "The solution does nothing. Whatever this is, it isn't normal ink."
return
if(volume >= 5)
var/obj/item/weapon/book/affectedbook = O
affectedbook.dat = null