fixes collision

This commit is contained in:
kevinz000
2019-10-27 17:02:52 -07:00
parent a7147a003c
commit 4f6bdf22a2
2 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -1030,7 +1030,7 @@ Note that amputating the affected organ does in fact remove the infection from t
W.germ_level = 0
return rval
/obj/item/organ/external/proc/clamp()
/obj/item/organ/external/proc/organ_clamp()
var/rval = 0
src.status &= ~ORGAN_BLEEDING
for(var/datum/wound/W in wounds)
+4 -4
View File
@@ -102,7 +102,7 @@
affected.open = 1
affected.createwound(CUT, 1)
affected.clamp()
affected.organ_clamp()
spread_germs_to_organ(affected, user)
/datum/surgery_step/generic/cut_with_laser/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -148,7 +148,7 @@
affected.status |= ORGAN_BLEEDING
affected.createwound(CUT, 1)
affected.clamp()
affected.organ_clamp()
affected.open = 2
/datum/surgery_step/generic/incision_manager/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -188,7 +188,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("<font color='blue'>[user] clamps bleeders in [target]'s [affected.name] with \the [tool].</font>", \
"<font color='blue'>You clamp bleeders in [target]'s [affected.name] with \the [tool].</font>")
affected.clamp()
affected.organ_clamp()
spread_germs_to_organ(affected, user)
/datum/surgery_step/generic/clamp_bleeders/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -340,4 +340,4 @@
user.visible_message("<font color='red'>[user]'s hand slips, sawing through the bone in [target]'s [affected.name] with \the [tool]!</font>", \
"<font color='red'>Your hand slips, sawwing through the bone in [target]'s [affected.name] with \the [tool]!</font>")
affected.createwound(CUT, 30)
affected.fracture()
affected.fracture()