cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-02 05:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes missed merge leftovers in syringe.dm

Browse Source
This commit is contained in:
Kelenius
2015-03-31 18:34:59 +03:00
parent 41ff9819bd
commit 502c9f1510
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/reagents/reagent_containers/syringes.dm
View File

@@ -58,8 +58,8 @@
if(mode == SYRINGE_BROKEN)
user << "<span class='warning'>This syringe is broken!</span>"
return
if(user.a_intent == I_HURT && ismob(target))
if(user.a_intent == I_HURT && ismob(target))
if((CLUMSY in user.mutations) && prob(50))
target = user
syringestab(target, user)
@@ -228,11 +228,7 @@
var/mob/living/carbon/human/H = target
var/target_zone = ran_zone(check_zone(user.zone_sel.selecting, target))
<<<<<<< HEAD
var/datum/organ/external/affecting = H.get_organ(target_zone)
=======
var/obj/item/organ/external/affecting = target:get_organ(target_zone)
>>>>>>> dev
var/obj/item/organ/external/affecting = H.get_organ(target_zone)
if (!affecting || (affecting.status & ORGAN_DESTROYED) || affecting.is_stump())
user << "<span class='danger'>They are missing that limb!</span>"
@@ -260,13 +256,8 @@
target.take_organ_damage(3)// 7 is the same as crowbar punch
var/syringestab_amount_transferred = rand(0, (reagents.total_volume - 5)) //nerfed by popular demand
<<<<<<< HEAD
reagents.trans_to_mob(target, syringestab_amount_transferred, CHEM_BLOOD)
break_syringe(target, user)
=======
src.reagents.trans_to(target, syringestab_amount_transferred)
src.break_syringe(target, user)
>>>>>>> dev
proc/break_syringe(mob/living/carbon/target, mob/living/carbon/user)
desc += " It is broken."