mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +01:00
The death or internal/external organ pathing (ft. fixed fox ears and recoloring bodypart overlays with dye sprays) (#87434)
## About The Pull Request This PR kills the abstract internal and external typepaths for organs, now replaced by an EXTERNAL_ORGAN flag to distinguish the two kinds. This PR also fixes fox ears (from #87162, no tail is added) and mushpeople's caps (they should be red, the screenshot is a tad outdated). And yes, you can now use a hair dye spray to recolor body parts like most tails, podpeople hair, mushpeople caps and cat ears. The process can be reversed by using the spray again. ## Why It's Good For The Game Time-Green put some effort during the last few months to untie functions and mechanics from external/internal organ pathing. Now, all that this pathing is good for are a few typechecks, easily replaceable with bitflags. Also podpeople and mushpeople need a way to recolor their "hair". This kind of applies to fish tails from the fish infusion, which colors can't be selected right now. The rest is just there if you ever want to recolor your lizard tail for some reason. Proof of testing btw (screenshot taken before mushpeople cap fix, right side has dyed body parts, moth can't be dyed, they're already fabolous):  ## Changelog 🆑 code: Removed internal/external pathing from organs in favor of a bit flag. Hopefully this shouldn't break anything about organs. fix: Fixed invisible fox ears. fix: Fixed mushpeople caps not being colored red by default. add: You can now dye most tails, podpeople hair, mushpeople caps etc. with a hair dye spray. /🆑
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
result = /obj/item/toy/plush/moth
|
||||
reqs = list(
|
||||
/obj/item/stack/sheet/animalhide/mothroach = 1,
|
||||
/obj/item/organ/internal/heart = 1,
|
||||
/obj/item/organ/heart = 1,
|
||||
/obj/item/stack/sheet/cloth = 3,
|
||||
)
|
||||
category = CAT_ENTERTAINMENT
|
||||
|
||||
@@ -156,7 +156,7 @@
|
||||
|
||||
/datum/crafting_recipe/flashlight_eyes
|
||||
name = "Flashlight Eyes"
|
||||
result = /obj/item/organ/internal/eyes/robotic/flashlight
|
||||
result = /obj/item/organ/eyes/robotic/flashlight
|
||||
time = 10
|
||||
reqs = list(
|
||||
/obj/item/flashlight = 2,
|
||||
|
||||
@@ -37,10 +37,10 @@
|
||||
name = "Tail Club"
|
||||
result = /obj/item/tailclub
|
||||
reqs = list(
|
||||
/obj/item/organ/external/tail/lizard = 1,
|
||||
/obj/item/organ/tail/lizard = 1,
|
||||
/obj/item/stack/sheet/iron = 1,
|
||||
)
|
||||
blacklist = list(/obj/item/organ/external/tail/lizard/fake)
|
||||
blacklist = list(/obj/item/organ/tail/lizard/fake)
|
||||
time = 4 SECONDS
|
||||
category = CAT_WEAPON_MELEE
|
||||
|
||||
@@ -63,10 +63,10 @@
|
||||
name = "Liz O' Nine Tails"
|
||||
result = /obj/item/melee/chainofcommand/tailwhip
|
||||
reqs = list(
|
||||
/obj/item/organ/external/tail/lizard = 1,
|
||||
/obj/item/organ/tail/lizard = 1,
|
||||
/obj/item/stack/cable_coil = 1,
|
||||
)
|
||||
blacklist = list(/obj/item/organ/external/tail/lizard/fake)
|
||||
blacklist = list(/obj/item/organ/tail/lizard/fake)
|
||||
time = 4 SECONDS
|
||||
category = CAT_WEAPON_MELEE
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
name = "Cat O' Nine Tails"
|
||||
result = /obj/item/melee/chainofcommand/tailwhip/kitty
|
||||
reqs = list(
|
||||
/obj/item/organ/external/tail/cat = 1,
|
||||
/obj/item/organ/tail/cat = 1,
|
||||
/obj/item/stack/cable_coil = 1,
|
||||
)
|
||||
time = 4 SECONDS
|
||||
|
||||
@@ -184,7 +184,7 @@
|
||||
/obj/item/stack/cable_coil = 5,
|
||||
/obj/item/stack/rods = 2,
|
||||
/obj/item/stack/sheet/glass = 1,
|
||||
/obj/item/organ/internal/heart/ethereal = 1,
|
||||
/obj/item/organ/heart/ethereal = 1,
|
||||
)
|
||||
category = CAT_ROBOT
|
||||
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
name = "Lizard Cloche Hat"
|
||||
result = /obj/item/clothing/head/costume/lizard
|
||||
time = 1 SECONDS
|
||||
reqs = list(/obj/item/organ/external/tail/lizard = 1)
|
||||
reqs = list(/obj/item/organ/tail/lizard = 1)
|
||||
category = CAT_CLOTHING
|
||||
|
||||
/datum/crafting_recipe/lizardhat_alternate
|
||||
@@ -268,8 +268,8 @@
|
||||
result = /obj/item/clothing/head/costume/kitty/genuine
|
||||
time = 1 SECONDS
|
||||
reqs = list(
|
||||
/obj/item/organ/external/tail/cat = 1,
|
||||
/obj/item/organ/internal/ears/cat = 1,
|
||||
/obj/item/organ/tail/cat = 1,
|
||||
/obj/item/organ/ears/cat = 1,
|
||||
)
|
||||
category = CAT_CLOTHING
|
||||
|
||||
|
||||
@@ -162,7 +162,7 @@
|
||||
// For carbonss we also want to clear out the stomach of any holywater
|
||||
if(iscarbon(target))
|
||||
var/mob/living/carbon/carbon_target = target
|
||||
var/obj/item/organ/internal/stomach/belly = carbon_target.get_organ_slot(ORGAN_SLOT_STOMACH)
|
||||
var/obj/item/organ/stomach/belly = carbon_target.get_organ_slot(ORGAN_SLOT_STOMACH)
|
||||
if(belly)
|
||||
holy_to_unholy += belly.reagents.get_reagent_amount(/datum/reagent/water/holywater)
|
||||
belly.reagents.del_reagent(/datum/reagent/water/holywater)
|
||||
|
||||
@@ -499,7 +499,7 @@ Behavior that's still missing from this component that original food items had t
|
||||
//Invoke the eater's stomach's after_eat callback if valid
|
||||
if(iscarbon(eater))
|
||||
var/mob/living/carbon/carbon_eater = eater
|
||||
var/obj/item/organ/internal/stomach/stomach = carbon_eater.get_organ_slot(ORGAN_SLOT_STOMACH)
|
||||
var/obj/item/organ/stomach/stomach = carbon_eater.get_organ_slot(ORGAN_SLOT_STOMACH)
|
||||
if(istype(stomach))
|
||||
stomach.after_eat(owner)
|
||||
|
||||
|
||||
@@ -17,10 +17,10 @@
|
||||
prepare_mob(parent)
|
||||
return
|
||||
|
||||
if(!istype(parent, /obj/item/organ/internal/brain))
|
||||
if(!istype(parent, /obj/item/organ/brain))
|
||||
return COMPONENT_INCOMPATIBLE
|
||||
|
||||
var/obj/item/organ/internal/brain/brein = parent
|
||||
var/obj/item/organ/brain/brein = parent
|
||||
if(brein.owner)
|
||||
prepare_mob(brein.owner)
|
||||
else
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
if(iscarbon(liver))
|
||||
var/mob/living/carbon/carbon = liver
|
||||
var/obj/item/organ/brain = carbon.get_organ_by_type(/obj/item/organ/internal/brain)
|
||||
var/obj/item/organ/brain = carbon.get_organ_by_type(/obj/item/organ/brain)
|
||||
if(brain)
|
||||
RegisterSignal(brain, COMSIG_ORGAN_REMOVED, PROC_REF(on_remove))
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
RegisterSignal(brein, COMSIG_ORGAN_IMPLANTED, PROC_REF(prepare_mob_from_brain))
|
||||
UnregisterSignal(brein, COMSIG_ORGAN_REMOVED)
|
||||
|
||||
/datum/component/ghostrole_on_revive/proc/prepare_mob_from_brain(obj/item/organ/internal/brain/brein, mob/living/owner)
|
||||
/datum/component/ghostrole_on_revive/proc/prepare_mob_from_brain(obj/item/organ/brain/brein, mob/living/owner)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
UnregisterSignal(brein, COMSIG_ORGAN_IMPLANTED)
|
||||
@@ -111,8 +111,8 @@
|
||||
var/mob/living/living
|
||||
if(isliving(parent))
|
||||
living = parent
|
||||
else if(istype(parent, /obj/item/organ/internal/brain))
|
||||
var/obj/item/organ/internal/brain/brain = parent
|
||||
else if(istype(parent, /obj/item/organ/brain))
|
||||
var/obj/item/organ/brain/brain = parent
|
||||
living = brain.owner
|
||||
living?.med_hud_set_status()
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
/datum/component/heart_eater/proc/prepare_species(mob/living/carbon/human/eater)
|
||||
if(eater.get_liked_foodtypes() & GORE)
|
||||
return
|
||||
var/obj/item/organ/internal/tongue/eater_tongue = eater.get_organ_slot(ORGAN_SLOT_TONGUE)
|
||||
var/obj/item/organ/tongue/eater_tongue = eater.get_organ_slot(ORGAN_SLOT_TONGUE)
|
||||
if(!eater_tongue)
|
||||
return
|
||||
eater_tongue.disliked_foodtypes &= ~GORE
|
||||
@@ -62,10 +62,10 @@
|
||||
|
||||
if(get_area(eater) == GLOB.areas_by_type[/area/centcom/wizard_station])
|
||||
return
|
||||
if(!istype(what_we_ate, /obj/item/organ/internal/heart))
|
||||
if(!istype(what_we_ate, /obj/item/organ/heart))
|
||||
return
|
||||
var/obj/item/organ/internal/heart/we_ate_heart = what_we_ate
|
||||
var/obj/item/organ/internal/heart/previous_heart = last_heart_we_ate?.resolve()
|
||||
var/obj/item/organ/heart/we_ate_heart = what_we_ate
|
||||
var/obj/item/organ/heart/previous_heart = last_heart_we_ate?.resolve()
|
||||
if(we_ate_heart == previous_heart)
|
||||
return
|
||||
if (!HAS_TRAIT(we_ate_heart, TRAIT_USED_ORGAN))
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
VAR_FINAL/datum/action/changeling/mmi_talk/talk_action
|
||||
|
||||
/datum/component/ling_decoy_brain/Initialize(datum/antagonist/changeling/ling)
|
||||
if(!istype(parent, /obj/item/organ/internal/brain))
|
||||
if(!istype(parent, /obj/item/organ/brain))
|
||||
return COMPONENT_INCOMPATIBLE
|
||||
if(isnull(ling))
|
||||
stack_trace("[type] instantiated without a changeling to link to.")
|
||||
@@ -22,13 +22,13 @@
|
||||
return ..()
|
||||
|
||||
/datum/component/ling_decoy_brain/RegisterWithParent()
|
||||
var/obj/item/organ/internal/brain/ling_brain = parent
|
||||
var/obj/item/organ/brain/ling_brain = parent
|
||||
ling_brain.organ_flags &= ~ORGAN_VITAL
|
||||
ling_brain.decoy_override = TRUE
|
||||
RegisterSignal(ling_brain, COMSIG_ATOM_ENTERING, PROC_REF(entered_mmi))
|
||||
|
||||
/datum/component/ling_decoy_brain/UnregisterFromParent()
|
||||
var/obj/item/organ/internal/brain/ling_brain = parent
|
||||
var/obj/item/organ/brain/ling_brain = parent
|
||||
ling_brain.organ_flags |= ORGAN_VITAL
|
||||
ling_brain.decoy_override = FALSE
|
||||
UnregisterSignal(ling_brain, COMSIG_ATOM_ENTERING, PROC_REF(entered_mmi))
|
||||
@@ -38,7 +38,7 @@
|
||||
*
|
||||
* Unfortunately this is hooked on Entering rather than its own dedicated MMI signal becuase MMI code is a fuck
|
||||
*/
|
||||
/datum/component/ling_decoy_brain/proc/entered_mmi(obj/item/organ/internal/brain/source, atom/entering, atom/old_loc, ...)
|
||||
/datum/component/ling_decoy_brain/proc/entered_mmi(obj/item/organ/brain/source, atom/entering, atom/old_loc, ...)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
var/mob/living/the_real_ling = parent_ling.owner.current
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/datum/component/manual_blinking
|
||||
dupe_mode = COMPONENT_DUPE_UNIQUE
|
||||
|
||||
var/obj/item/organ/internal/eyes/E
|
||||
var/obj/item/organ/eyes/E
|
||||
var/warn_grace = FALSE
|
||||
var/warn_dying = FALSE
|
||||
var/last_blink
|
||||
@@ -69,18 +69,18 @@
|
||||
/datum/component/manual_blinking/proc/check_added_organ(mob/who_cares, obj/item/organ/O)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
var/obj/item/organ/internal/eyes/new_eyes = O
|
||||
var/obj/item/organ/eyes/new_eyes = O
|
||||
|
||||
if(istype(new_eyes,/obj/item/organ/internal/eyes))
|
||||
if(istype(new_eyes,/obj/item/organ/eyes))
|
||||
E = new_eyes
|
||||
START_PROCESSING(SSdcs, src)
|
||||
|
||||
/datum/component/manual_blinking/proc/check_removed_organ(mob/who_cares, obj/item/organ/O)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
var/obj/item/organ/internal/eyes/bye_beyes = O // oh come on, that's pretty good
|
||||
var/obj/item/organ/eyes/bye_beyes = O // oh come on, that's pretty good
|
||||
|
||||
if(istype(bye_beyes, /obj/item/organ/internal/eyes))
|
||||
if(istype(bye_beyes, /obj/item/organ/eyes))
|
||||
E = null
|
||||
STOP_PROCESSING(SSdcs, src)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/datum/component/manual_breathing
|
||||
dupe_mode = COMPONENT_DUPE_UNIQUE
|
||||
|
||||
var/obj/item/organ/internal/lungs/L
|
||||
var/obj/item/organ/lungs/L
|
||||
var/warn_grace = FALSE
|
||||
var/warn_dying = FALSE
|
||||
var/last_breath
|
||||
@@ -71,18 +71,18 @@
|
||||
/datum/component/manual_breathing/proc/check_added_organ(mob/who_cares, obj/item/organ/O)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
var/obj/item/organ/internal/eyes/new_lungs = O
|
||||
var/obj/item/organ/eyes/new_lungs = O
|
||||
|
||||
if(istype(new_lungs,/obj/item/organ/internal/lungs))
|
||||
if(istype(new_lungs,/obj/item/organ/lungs))
|
||||
L = new_lungs
|
||||
START_PROCESSING(SSdcs, src)
|
||||
|
||||
/datum/component/manual_breathing/proc/check_removed_organ(mob/who_cares, obj/item/organ/O)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
var/obj/item/organ/internal/lungs/old_lungs = O
|
||||
var/obj/item/organ/lungs/old_lungs = O
|
||||
|
||||
if(istype(old_lungs, /obj/item/organ/internal/lungs))
|
||||
if(istype(old_lungs, /obj/item/organ/lungs))
|
||||
L = null
|
||||
STOP_PROCESSING(SSdcs, src)
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
pump_action.Grant(parent)
|
||||
|
||||
var/mob/living/carbon/carbon_parent = parent
|
||||
var/obj/item/organ/internal/heart/parent_heart = carbon_parent.get_organ_slot(ORGAN_SLOT_HEART)
|
||||
var/obj/item/organ/heart/parent_heart = carbon_parent.get_organ_slot(ORGAN_SLOT_HEART)
|
||||
if(parent_heart && !HAS_TRAIT(carbon_parent, TRAIT_NOBLOOD) && carbon_parent.stat != DEAD)
|
||||
START_PROCESSING(SSdcs, src)
|
||||
COOLDOWN_START(src, heart_timer, pump_delay)
|
||||
@@ -126,7 +126,7 @@
|
||||
/datum/component/manual_heart/proc/check_added_organ(mob/organ_owner, obj/item/organ/new_organ)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
var/obj/item/organ/internal/heart/new_heart = new_organ
|
||||
var/obj/item/organ/heart/new_heart = new_organ
|
||||
|
||||
if(!istype(new_heart) || !check_valid())
|
||||
return
|
||||
@@ -141,7 +141,7 @@
|
||||
/datum/component/manual_heart/proc/check_removed_organ(mob/organ_owner, obj/item/organ/removed_organ)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
var/obj/item/organ/internal/heart/removed_heart = removed_organ
|
||||
var/obj/item/organ/heart/removed_heart = removed_organ
|
||||
|
||||
if(istype(removed_heart))
|
||||
pump_action.build_all_button_icons(UPDATE_BUTTON_STATUS)
|
||||
@@ -150,7 +150,7 @@
|
||||
///Helper proc to check if processing can be restarted.
|
||||
/datum/component/manual_heart/proc/check_valid()
|
||||
var/mob/living/carbon/carbon_parent = parent
|
||||
var/obj/item/organ/internal/heart/parent_heart = carbon_parent.get_organ_slot(ORGAN_SLOT_HEART)
|
||||
var/obj/item/organ/heart/parent_heart = carbon_parent.get_organ_slot(ORGAN_SLOT_HEART)
|
||||
return !isnull(parent_heart) && !HAS_TRAIT(carbon_parent, TRAIT_NOBLOOD) && carbon_parent.stat != DEAD
|
||||
|
||||
///Action to pump your heart. Cooldown will always be set to 1 second less than the pump delay.
|
||||
@@ -171,7 +171,7 @@
|
||||
var/mob/living/carbon/heart_haver = owner
|
||||
if(!istype(heart_haver) || HAS_TRAIT(heart_haver, TRAIT_NOBLOOD) || heart_haver.stat == DEAD)
|
||||
return FALSE
|
||||
var/obj/item/organ/internal/heart/heart_havers_heart = heart_haver.get_organ_slot(ORGAN_SLOT_HEART)
|
||||
var/obj/item/organ/heart/heart_havers_heart = heart_haver.get_organ_slot(ORGAN_SLOT_HEART)
|
||||
if(isnull(heart_havers_heart))
|
||||
return FALSE
|
||||
return ..()
|
||||
|
||||
@@ -169,7 +169,7 @@
|
||||
var/mob/living/carbon/human/lich = new(parent_turf)
|
||||
ADD_TRAIT(lich, TRAIT_NO_SOUL, LICH_TRAIT)
|
||||
|
||||
var/obj/item/organ/internal/brain/new_lich_brain = lich.get_organ_slot(ORGAN_SLOT_BRAIN)
|
||||
var/obj/item/organ/brain/new_lich_brain = lich.get_organ_slot(ORGAN_SLOT_BRAIN)
|
||||
if(new_lich_brain) // Prevent MMI cheese
|
||||
new_lich_brain.organ_flags &= ~ORGAN_VITAL
|
||||
new_lich_brain.decoy_override = TRUE
|
||||
@@ -201,7 +201,7 @@
|
||||
var/mob/living/carbon/carbon_body = corpse
|
||||
for(var/obj/item/organ/to_drop as anything in carbon_body.organs)
|
||||
// Skip the brain - it can disappear, we don't need it anymore
|
||||
if(istype(to_drop, /obj/item/organ/internal/brain))
|
||||
if(istype(to_drop, /obj/item/organ/brain))
|
||||
continue
|
||||
|
||||
// For the rest, drop all the organs onto the floor (for style)
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
SIGNAL_HANDLER
|
||||
|
||||
var/mob/living/carbon/carbon_parent = parent
|
||||
var/obj/item/organ/internal/tongue/tongue = carbon_parent.get_organ_slot(ORGAN_SLOT_TONGUE)
|
||||
var/obj/item/organ/tongue/tongue = carbon_parent.get_organ_slot(ORGAN_SLOT_TONGUE)
|
||||
if(tongue)
|
||||
tongue.temp_say_mod = "signs"
|
||||
//this speech relies on hands, which we have our own way of garbling speech when they're occupied, so we can have this always on
|
||||
@@ -102,7 +102,7 @@
|
||||
SIGNAL_HANDLER
|
||||
|
||||
var/mob/living/carbon/carbon_parent = parent
|
||||
var/obj/item/organ/internal/tongue/tongue = carbon_parent.get_organ_slot(ORGAN_SLOT_TONGUE)
|
||||
var/obj/item/organ/tongue/tongue = carbon_parent.get_organ_slot(ORGAN_SLOT_TONGUE)
|
||||
if(tongue)
|
||||
tongue.temp_say_mod = ""
|
||||
REMOVE_TRAIT(carbon_parent, TRAIT_SPEAKS_CLEARLY, SPEAKING_FROM_HANDS)
|
||||
@@ -128,9 +128,9 @@
|
||||
/datum/component/sign_language/proc/on_added_organ(mob/living/source, obj/item/organ/new_organ)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
if(!istype(new_organ, /obj/item/organ/internal/tongue))
|
||||
if(!istype(new_organ, /obj/item/organ/tongue))
|
||||
return
|
||||
var/obj/item/organ/internal/tongue/new_tongue = new_organ
|
||||
var/obj/item/organ/tongue/new_tongue = new_organ
|
||||
new_tongue.temp_say_mod = "signs"
|
||||
|
||||
/// Signal proc for [COMSIG_MOB_TRY_SPEECH]
|
||||
@@ -238,7 +238,7 @@
|
||||
return SPELL_INVOCATION_ALWAYS_SUCCEED
|
||||
|
||||
/// Signal proc for [COMSIG_LIVING_TREAT_MESSAGE]
|
||||
/// Changes our message based on conditions that limit or alter our ability to communicate
|
||||
/// Changes our message based on conditions that limit or alter our ability to communicate
|
||||
/datum/component/sign_language/proc/on_treat_living_message(atom/movable/source, list/message_args)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
else if(isstructure(parent))
|
||||
RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(use_squeak))
|
||||
|
||||
if(istype(parent, /obj/item/organ/internal/liver))
|
||||
if(istype(parent, /obj/item/organ/liver))
|
||||
// Liver squeaking is depending on them functioning like a clown's liver
|
||||
RegisterSignal(parent, SIGNAL_REMOVETRAIT(TRAIT_COMEDY_METABOLISM), PROC_REF(on_comedy_metabolism_removal))
|
||||
|
||||
|
||||
@@ -130,7 +130,7 @@
|
||||
)
|
||||
return
|
||||
|
||||
var/obj/item/organ/internal/tongue/licking_tongue = user.get_organ_slot(ORGAN_SLOT_TONGUE)
|
||||
var/obj/item/organ/tongue/licking_tongue = user.get_organ_slot(ORGAN_SLOT_TONGUE)
|
||||
if(licking_tongue)
|
||||
dust_mob(source, user,
|
||||
span_danger("As [user] hesitantly leans in and licks [atom_source] everything goes silent before [user.p_their()] body starts to glow and burst into flames before flashing to ash!"),
|
||||
|
||||
@@ -399,13 +399,13 @@
|
||||
if(HAS_TRAIT(tackle_target, TRAIT_BRAWLING_KNOCKDOWN_BLOCKED)) // riot armor and such
|
||||
defense_mod += 5
|
||||
|
||||
var/obj/item/organ/external/tail/lizard/el_tail = tackle_target.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL)
|
||||
var/obj/item/organ/tail/lizard/el_tail = tackle_target.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL)
|
||||
if(HAS_TRAIT(tackle_target, TRAIT_TACKLING_TAILED_DEFENDER) && !el_tail)
|
||||
defense_mod -= 1
|
||||
if(el_tail && (el_tail.wag_flags & WAG_WAGGING)) // lizard tail wagging is robust and can swat away assailants!
|
||||
defense_mod += 1
|
||||
|
||||
var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = tackle_target.get_organ_slot(ORGAN_SLOT_SPINE)
|
||||
var/obj/item/organ/cyberimp/chest/spine/potential_spine = tackle_target.get_organ_slot(ORGAN_SLOT_SPINE)
|
||||
if(istype(potential_spine))
|
||||
defense_mod += potential_spine.strength_bonus
|
||||
|
||||
@@ -434,14 +434,14 @@
|
||||
attack_mod += 2
|
||||
|
||||
if(HAS_TRAIT(sacker, TRAIT_TACKLING_WINGED_ATTACKER))
|
||||
var/obj/item/organ/external/wings/moth/sacker_moth_wing = sacker.get_organ_slot(ORGAN_SLOT_EXTERNAL_WINGS)
|
||||
var/obj/item/organ/wings/moth/sacker_moth_wing = sacker.get_organ_slot(ORGAN_SLOT_EXTERNAL_WINGS)
|
||||
if(!sacker_moth_wing || sacker_moth_wing.burnt)
|
||||
attack_mod -= 2
|
||||
var/obj/item/organ/external/wings/sacker_wing = sacker.get_organ_slot(ORGAN_SLOT_EXTERNAL_WINGS)
|
||||
var/obj/item/organ/wings/sacker_wing = sacker.get_organ_slot(ORGAN_SLOT_EXTERNAL_WINGS)
|
||||
if(sacker_wing)
|
||||
attack_mod += 2
|
||||
|
||||
var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = sacker.get_organ_slot(ORGAN_SLOT_SPINE)
|
||||
var/obj/item/organ/cyberimp/chest/spine/potential_spine = sacker.get_organ_slot(ORGAN_SLOT_SPINE)
|
||||
if(istype(potential_spine))
|
||||
attack_mod += potential_spine.strength_bonus
|
||||
|
||||
@@ -508,7 +508,7 @@
|
||||
if(HAS_TRAIT(user, TRAIT_HEAD_INJURY_BLOCKED))
|
||||
oopsie_mod -= 6
|
||||
|
||||
var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = user.get_organ_slot(ORGAN_SLOT_SPINE) // Can't snap that spine if it's made of metal.
|
||||
var/obj/item/organ/cyberimp/chest/spine/potential_spine = user.get_organ_slot(ORGAN_SLOT_SPINE) // Can't snap that spine if it's made of metal.
|
||||
if(istype(potential_spine))
|
||||
oopsie_mod -= potential_spine.strength_bonus
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
for(var/mob/living/carbon/viewer in viewers(parent))
|
||||
if(viewer.is_blind() || viewer.get_eye_protection() >= damage_per_second)
|
||||
continue
|
||||
var/obj/item/organ/internal/eyes/burning_orbs = locate() in viewer.organs
|
||||
var/obj/item/organ/eyes/burning_orbs = locate() in viewer.organs
|
||||
if(!burning_orbs)
|
||||
continue
|
||||
burning_orbs.apply_organ_damage(damage_per_second * seconds_per_tick)
|
||||
|
||||
Reference in New Issue
Block a user