mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 13:10:02 +01:00
[MIRROR] Cleans up ..() usage in organs' Insert() and Remove() [MDB IGNORE] (#19948)
* Cleans up `..()` usage in organs' `Insert()` and `Remove()` (#74055) ## About The Pull Request fumbled around while investigating #74047 and turns out there's other organs that have the same issue as the reported alien organs in that issue. went around and replaced parent calls where applicable (cursed/demonic hearts, flashlight eyes, alien organs, abductor glands) ## Why It's Good For The Game Fixes #74047 Considerably less ghost internal organs, hopefully less unreported jank on removing organs ## Changelog 🆑 fix: fixed a few internal organs acting wonky on inserting/removing (some xenomorph organs, abductor glands, flashlight eyes, demon/cursed hearts) /🆑 * Cleans up `..()` usage in organs' `Insert()` and `Remove()` --------- Co-authored-by: Sealed101 <75863639+Sealed101@users.noreply.github.com>
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
Insert(loc)
|
||||
|
||||
/obj/item/organ/internal/body_egg/Insert(mob/living/carbon/M, special = FALSE, drop_if_replaced = TRUE)
|
||||
..()
|
||||
. = ..()
|
||||
ADD_TRAIT(owner, TRAIT_XENO_HOST, ORGAN_TRAIT)
|
||||
ADD_TRAIT(owner, TRAIT_XENO_IMMUNE, ORGAN_TRAIT)
|
||||
owner.med_hud_set_status()
|
||||
@@ -28,7 +28,7 @@
|
||||
REMOVE_TRAIT(owner, TRAIT_XENO_IMMUNE, ORGAN_TRAIT)
|
||||
owner.med_hud_set_status()
|
||||
INVOKE_ASYNC(src, PROC_REF(RemoveInfectionImages), owner)
|
||||
..()
|
||||
return ..()
|
||||
|
||||
/obj/item/organ/internal/body_egg/on_death(delta_time, times_fired)
|
||||
. = ..()
|
||||
|
||||
Reference in New Issue
Block a user