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

Merge pull request #10452 from mwerezak/stump-fix

Browse Source 
Backports #10331
This commit is contained in:
PsiOmegaDelta
2015-08-08 19:16:25 +02:00
parent c560bd8d79 4139a51946
commit 22c500ed2b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/carbon/human/inventory.dm
View File

@@ -41,7 +41,7 @@ This saves us from having to call add_fingerprint() any time something is put in
/mob/living/carbon/human/proc/has_organ(name) /mob/living/carbon/human/proc/has_organ(name)
var/obj/item/organ/external/O = organs_by_name[name] var/obj/item/organ/external/O = organs_by_name[name]
return (O && !(O.status & ORGAN_DESTROYED) ) return (O && !(O.status & ORGAN_DESTROYED) && !O.is_stump())
/mob/living/carbon/human/proc/has_organ_for_slot(slot) /mob/living/carbon/human/proc/has_organ_for_slot(slot)
switch(slot) switch(slot)

3
code/modules/organs/organ_stump.dm
View File

@@ -22,3 +22,6 @@
/obj/item/organ/external/stump/removed() /obj/item/organ/external/stump/removed()
..() ..()
qdel(src) qdel(src)
/obj/item/organ/external/stump/is_usable()
return 0