From e3de27f8284a89a9a9a4232f9ae35124d8cf010e Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sun, 28 Jul 2024 16:40:29 +0100 Subject: [PATCH] that explains why it said all the code was fine --- code/modules/borer/borer.dm | 36 +++++++++++++++++++++++++++------ code/modules/borer/borer_egg.dm | 4 ++-- code/modules/borer/borer_wip.dm | 1 + 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/code/modules/borer/borer.dm b/code/modules/borer/borer.dm index 0c8d12bc8b04..c0fd31ef67cb 100644 --- a/code/modules/borer/borer.dm +++ b/code/modules/borer/borer.dm @@ -139,6 +139,7 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "brain_resist" /datum/action/innate/borer/brain_resist/action_activate() + . = ..() if(isliving(owner)) var/mob/living/live_owner = owner live_owner.resist() @@ -489,6 +490,7 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "borer_help" /datum/action/innate/borer/helpme/action_activate() + . = ..() var/mob/living/carbon/cortical_borer/the_borer if(!isborer(owner)) if(owner.has_brain_worms()) @@ -505,6 +507,7 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "borer_talk" /datum/action/innate/borer/talk_to_host/action_activate() + . = ..() var/mob/living/carbon/cortical_borer/the_borer = owner the_borer.Communicate() @@ -513,6 +516,7 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "borer_infest" /datum/action/innate/borer/infest_host/action_activate() + . = ..() var/mob/living/carbon/cortical_borer/the_borer = owner the_borer.infest() @@ -521,7 +525,9 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "borer_hiding_0" /datum/action/innate/borer/toggle_hide/action_activate() - if(!isborer(owner)) return FALSE + . = ..() + if(!isborer(owner)) + return FALSE var/mob/living/carbon/cortical_borer/the_borer = owner the_borer.hide_borer() @@ -533,6 +539,7 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "borer_talk" /datum/action/innate/borer/talk_to_borer/action_activate() + . = ..() var/mob/living/carbon/cortical_borer/the_borer = owner.has_brain_worms() the_borer.host_mob = owner the_borer.host_mob.borer_comm() @@ -542,6 +549,7 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "borer_talk" /datum/action/innate/borer/talk_to_brain/action_activate() + . = ..() var/mob/living/carbon/cortical_borer/the_borer = owner.has_brain_worms() the_borer.host_mob = owner the_borer.host_mob.trapped_mind_comm() @@ -551,7 +559,9 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "borer_control" /datum/action/innate/borer/take_control/action_activate() - if(!isborer(owner)) return FALSE + . = ..() + if(!isborer(owner)) + return FALSE var/mob/living/carbon/cortical_borer/the_borer = owner if(the_borer.borer_flags_actives & BORER_ABILITY_HIBERNATING) to_chat(the_borer, SPAN_WARNING("You cannot do that while hibernating!")) @@ -563,6 +573,7 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "borer_leave" /datum/action/innate/borer/give_back_control/action_activate() + . = ..() var/mob/living/carbon/cortical_borer/the_borer = owner.has_brain_worms() the_borer.host_mob = owner the_borer.host_mob.release_control() @@ -572,7 +583,9 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "borer_leave" /datum/action/innate/borer/leave_body/action_activate() - if(!isborer(owner)) return FALSE + . = ..() + if(!isborer(owner)) + return FALSE var/mob/living/carbon/cortical_borer/the_borer = owner if(the_borer.borer_flags_actives & BORER_ABILITY_HIBERNATING) to_chat(the_borer, SPAN_WARNING("You cannot do that while hibernating!")) @@ -584,7 +597,9 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "borer_human_chems" /datum/action/innate/borer/make_chems/action_activate() - if(!isborer(owner)) return FALSE + . = ..() + if(!isborer(owner)) + return FALSE var/mob/living/carbon/cortical_borer/the_borer = owner if(the_borer.borer_flags_actives & BORER_ABILITY_HIBERNATING) to_chat(the_borer, SPAN_WARNING("You cannot do that while hibernating!")) @@ -596,7 +611,9 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "borer_human_scan" /datum/action/innate/borer/scan_chems/action_activate() - if(!isborer(owner)) return FALSE + . = ..() + if(!isborer(owner)) + return FALSE var/mob/living/carbon/cortical_borer/the_borer = owner if(the_borer.borer_flags_actives & BORER_ABILITY_HIBERNATING) to_chat(the_borer, SPAN_WARNING("You cannot do that while hibernating!")) @@ -608,7 +625,9 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "borer_human_learn" /datum/action/innate/borer/learn_chems/action_activate() - if(!isborer(owner)) return FALSE + . = ..() + if(!isborer(owner)) + return FALSE var/mob/living/carbon/cortical_borer/the_borer = owner if(the_borer.borer_flags_actives & BORER_ABILITY_HIBERNATING) to_chat(the_borer, SPAN_WARNING("You cannot do that while hibernating!")) @@ -620,6 +639,7 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "borer_reproduce" /datum/action/innate/borer/make_larvae/action_activate() + . = ..() var/mob/living/carbon/cortical_borer/the_borer = owner.has_brain_worms() the_borer.host_mob = owner the_borer.host_mob.spawn_larvae() @@ -629,6 +649,7 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "borer_stun" /datum/action/innate/borer/freeze_victim/action_activate() + . = ..() var/mob/living/carbon/cortical_borer/the_borer = owner the_borer.dominate_victim() @@ -637,6 +658,7 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "borer_torment" /datum/action/innate/borer/torment/action_activate() + . = ..() var/mob/living/carbon/cortical_borer/the_borer = owner.has_brain_worms() the_borer.host_mob = owner the_borer.host_mob.punish_host() @@ -646,6 +668,7 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "borer_sleeping_0" /datum/action/innate/borer/hibernate/action_activate() + . = ..() var/mob/living/carbon/cortical_borer/the_borer = owner the_borer.hibernate() button.overlays.Cut() @@ -659,5 +682,6 @@ GLOBAL_DATUM_INIT(brainlink, /datum/borer_brainlink, new) action_icon_state = "borer_transfer" /datum/action/innate/borer/transfer_host/action_activate() + . = ..() var/mob/living/carbon/cortical_borer/the_borer = owner.has_brain_worms() the_borer.transfer_host() diff --git a/code/modules/borer/borer_egg.dm b/code/modules/borer/borer_egg.dm index d2902e2d1cc8..934f86c24642 100644 --- a/code/modules/borer/borer_egg.dm +++ b/code/modules/borer/borer_egg.dm @@ -10,6 +10,7 @@ layer = MOB_LAYER black_market_value = 35 + var/hatched = FALSE var/birth_generation = 1 var/can_reproduce = 1 var/target_flags = BORER_TARGET_HUMANS @@ -43,5 +44,4 @@ var/mob/living/carbon/cortical_borer/birthed = new /mob/living/carbon/cortical_borer(loc, birth_generation, TRUE, can_reproduce, target_flags, ancestors) user.mind.transfer_to(birthed, TRUE) - birthed.visible_message(SPAN_XENODANGER("A facehugger suddenly emerges out of \the [A]!"), SPAN_XENODANGER("You emerge out of \the [A] and awaken from your slumber. For the Hive!")) - playsound(birthed, 'sound/effects/xeno_newlarva.ogg', 25, TRUE) + birthed.visible_message(SPAN_XENODANGER("A Borer suddenly emerges out of \the [src]!"), SPAN_XENODANGER("You emerge out of \the [src] and awaken from your slumber.")) diff --git a/code/modules/borer/borer_wip.dm b/code/modules/borer/borer_wip.dm index cb0358ed406f..4bc9ce949cbb 100644 --- a/code/modules/borer/borer_wip.dm +++ b/code/modules/borer/borer_wip.dm @@ -80,6 +80,7 @@ action_icon_state = "borer_directive" /datum/action/innate/borer/update_directive/action_activate() + . = ..() var/mob/living/carbon/cortical_borer/the_borer = owner the_borer.update_directive()