cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5917 from mwerezak/fix

Browse Source 
Some fixes
This commit is contained in:
Ccomp5950
2014-08-08 20:45:27 -05:00
parent 36bf8f6083 a6c31bc5e8
commit 882d505824
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -982,8 +982,7 @@ mob/proc/yank_out_object()
if(valid_objects.len == 1) //Yanking out last object - removing verb.
src.verbs -= /mob/proc/yank_out_object
if(istype(src,/mob/living/carbon/human))
if(ishuman(src))
var/mob/living/carbon/human/H = src
var/datum/organ/external/affected
@@ -994,13 +993,16 @@ mob/proc/yank_out_object()
affected.implants -= selection
H.shock_stage+=20
H.bloody_hands(S)
affected.take_damage((selection.w_class * 3), 0, 0, 1, "Embedded object extraction")
if(prob(selection.w_class * 5)) //I'M SO ANEMIC I COULD JUST -DIE-.
var/datum/wound/internal_bleeding/I = new (15)
affected.wounds += I
H.custom_pain("Something tears wetly in your [affected] as [selection] is pulled free!", 1)
if (ishuman(U))
var/mob/living/carbon/human/human_user = U
human_user.bloody_hands(H)
selection.loc = get_turf(src)