cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 00:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #4223

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/human_defense.dm
This commit is contained in:
Zuhayr
2014-01-30 22:06:57 +10:30
committed by ZomgPonies
parent 56e71df462
commit 6302573ed3
3 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/mob/living/carbon/human/human_damage.dm
View File

@@ -251,24 +251,13 @@
if(!istype(W, /obj/item/weapon/butch/meatcleaver))
organ.implants += W
visible_message("<span class='danger'>\The [W] sticks in the wound!</span>")
src.verbs += /mob/proc/yank_out_object
W.add_blood(src)
if(ismob(W.loc))
var/mob/living/H = W.loc
H.drop_item()
W.loc = src
else if(istype(used_weapon,/obj/item/projectile)) //We don't want to use the actual projectile item, so we spawn some shrapnel.
var/obj/item/projectile/P = used_weapon
if(prob(75) && P.embed)
var/obj/item/weapon/shard/shrapnel/S = new()
S.name = "[P.name] shrapnel"
S.desc = "[S.desc] It looks like it was fired from [P.shot_from]."
S.loc = src
organ.implants += S
visible_message("<span class='danger'>The projectile sticks in the wound!</span>")
S.add_blood(src)
return 1
// incredibly important stuff follows
/mob/living/carbon/human/fall(var/forced)
..()
@@ -284,4 +273,4 @@
if(prob(60))
step_rand(H)
if(!stat)
src << "<span class='warning'>Your [H] fell off!</span>"
src << "<span class='warning'>Your [H] fell off!</span>"

1
code/modules/mob/living/carbon/human/human_defense.dm
View File

@@ -102,7 +102,6 @@ emp_act
visible_message("<span class='danger'>The projectile sticks in the wound!</span>")
src.verbs += /mob/proc/yank_out_object
SP.add_blood(src)
return (..(P , def_zone))

1
code/modules/mob/mob.dm
View File

@@ -1166,6 +1166,7 @@ mob/proc/yank_out_object()
visible_message("<span class='warning'><b>[src] rips [selection] out of their body.</b></span>","<span class='warning'><b>You rip [selection] out of your body.</b></span>")
else
visible_message("<span class='warning'><b>[usr] rips [selection] out of [src]'s body.</b></span>","<span class='warning'><b>[usr] rips [selection] out of your body.</b></span>")
src.verbs -= /mob/proc/yank_out_object
if(istype(src,/mob/living/carbon/human))