cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Initial fixes

Browse Source 
Changes interaction between stumps and items.
This commit is contained in:
Kearel
2015-07-26 18:40:07 -05:00
parent 32cdb06f63
commit f4aa2376c8
2 changed files with 5 additions and 2 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)

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

@@ -14,7 +14,7 @@
..(holder, internal) ..(holder, internal)
if(istype(limb)) if(istype(limb))
max_damage = limb.max_damage max_damage = limb.max_damage
if((limb.status & ORGAN_ROBOT) && (!parent || (parent.status & ORGAN_ROBOT))) if((limb.status & ORGAN_ROBOT) && (!parent || (parent.status & ORGAN_ROBOT)))
robotize() //if both limb and the parent are robotic, the stump is robotic too robotize() //if both limb and the parent are robotic, the stump is robotic too
/obj/item/organ/external/stump/is_stump() /obj/item/organ/external/stump/is_stump()
@@ -23,3 +23,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