shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates all BODYPART_ORGANIC occurances

Browse Source 
:)
This commit is contained in:
DeltaFire
2020-10-06 18:01:25 +02:00
parent 4146566af0
commit 06cb91ca3d
13 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/surgery/bodyparts/_bodyparts.dm
View File

@@ -745,7 +745,7 @@
if(burnstate)
. += image('icons/mob/dam_mob.dmi', "[dmg_overlay_type]_[body_zone]_0[burnstate]", -DAMAGE_LAYER, image_dir)
if(!isnull(body_markings) && status == BODYPART_ORGANIC)
if(!isnull(body_markings) && is_organic_limb(FALSE))
if(!use_digitigrade)
if(body_zone == BODY_ZONE_CHEST)
. += image(body_markings_icon, "[body_markings]_[body_zone]_[icon_gender]", -MARKING_LAYER, image_dir)
@@ -922,7 +922,7 @@
update_disabled()
/obj/item/bodypart/proc/get_bleed_rate()
if(status != BODYPART_ORGANIC) // maybe in the future we can bleed oil from aug parts, but not now
if(!is_organic_limb()) // maybe in the future we can bleed oil from aug parts, but not now
return
var/bleed_rate = 0
if(generic_bleedstacks > 0)

4
code/modules/surgery/brain_surgery.dm
View File

@@ -10,14 +10,14 @@
target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
possible_locs = list(BODY_ZONE_HEAD)
requires_bodypart_type = BODYPART_ORGANIC
requires_bodypart_type = 0
/datum/surgery_step/fix_brain
name = "fix brain"
implements = list(TOOL_HEMOSTAT = 85, TOOL_SCREWDRIVER = 35, /obj/item/pen = 15) //don't worry, pouring some alcohol on their open brain will get that chance to 100
time = 120 //long and complicated
/datum/surgery/brain_surgery/can_start(mob/user, mob/living/carbon/target, obj/item/tool)
var/obj/item/organ/brain/B = target.getorganslot(ORGAN_SLOT_BRAIN)
if(!B)
if(!B || istype(B, /obj/item/organ/brain/ipc))
return FALSE
return TRUE

38
code/modules/surgery/helpers.dm
View File

@@ -27,15 +27,16 @@
if(!S.requires_bodypart)
continue
if(S.requires_bodypart_type) //ugly but it'll do.
if(S.requires_bodypart_type == BODYPART_ORGANIC)
if(!affecting.is_organic_limb(FALSE))
continue
else if(S.requires_bodypart_type == BODYPART_ROBOTIC)
if(!affecting.is_robotic_limb())
continue
else if(S.requires_bodypart_type == BODYPART_HYBRID)
if(!affecting.is_organic_limb() || !affecting.is_robotic_limb())
continue
switch(S.requires_bodypart_type)
if(BODYPART_ORGANIC)
if(!affecting.is_organic_limb(FALSE))
continue
if(BODYPART_ROBOTIC)
if(!affecting.is_robotic_limb())
continue
if(BODYPART_HYBRID)
if(!affecting.is_organic_limb() || !affecting.is_robotic_limb())
continue
if(S.requires_real_bodypart && affecting.is_pseudopart)
continue
else if(C && S.requires_bodypart) //mob with no limb in surgery zone when we need a limb
@@ -67,15 +68,16 @@
if(!S.requires_bodypart)
return
if(S.requires_bodypart_type) //*scream
if(S.requires_bodypart_type == BODYPART_ORGANIC)
if(!affecting.is_organic_limb(FALSE))
return
else if(S.requires_bodypart_type == BODYPART_ROBOTIC)
if(!affecting.is_robotic_limb())
return
else if(S.requires_bodypart_type == BODYPART_HYBRID)
if(!affecting.is_organic_limb() || !affecting.is_robotic_limb())
return
switch(S.requires_bodypart_type)
if(BODYPART_ORGANIC)
if(!affecting.is_organic_limb(FALSE))
return
if(BODYPART_ROBOTIC)
if(!affecting.is_robotic_limb())
return
if(BODYPART_HYBRID)
if(!affecting.is_organic_limb() || !affecting.is_robotic_limb())
return
else if(C && S.requires_bodypart)
return
if(S.lying_required && !(M.lying))