Merge pull request #5533 from mwerezak/wound-infections

Fix for #5532 and the last of the infection changes, I hope
This commit is contained in:
Zuhayr
2014-07-09 19:28:00 +09:30
7 changed files with 98 additions and 37 deletions
+6 -2
View File
@@ -157,7 +157,10 @@
var/datum/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
if(affecting.open == 0)
if(!affecting.bandage())
var/bandaged = affecting.bandage()
var/disinfected = affecting.disinfect()
if(!(bandaged || disinfected))
user << "\red The wounds on [M]'s [affecting.display_name] have already been treated."
return 1
else
@@ -174,7 +177,8 @@
else
user.visible_message( "\blue [user] smears some bioglue over [W.desc] on [M]'s [affecting.display_name].", \
"\blue You smear some bioglue over [W.desc] on [M]'s [affecting.display_name]." )
affecting.heal_damage(heal_brute,0)
if (bandaged)
affecting.heal_damage(heal_brute,0)
use(1)
else
if (can_operate(H)) //Checks if mob is lying down on table for surgery