diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm index 99c12db28ed..2eaa44d1b36 100644 --- a/code/game/objects/items/body_egg.dm +++ b/code/game/objects/items/body_egg.dm @@ -22,7 +22,7 @@ owner.med_hud_set_status() INVOKE_ASYNC(src, .proc/AddInfectionImages, owner) -/obj/item/organ/internal/body_egg/Remove(mob/living/carbon/M, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/body_egg/Remove(mob/living/carbon/M, special = FALSE) if(owner) REMOVE_TRAIT(owner, TRAIT_XENO_HOST, ORGAN_TRAIT) REMOVE_TRAIT(owner, TRAIT_XENO_IMMUNE, ORGAN_TRAIT) diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm index 930ca49ab56..c84dbf580ee 100644 --- a/code/modules/antagonists/abductor/equipment/gland.dm +++ b/code/modules/antagonists/abductor/equipment/gland.dm @@ -80,7 +80,7 @@ active_mind_control = FALSE return TRUE -/obj/item/organ/internal/heart/gland/Remove(mob/living/carbon/M, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/heart/gland/Remove(mob/living/carbon/M, special = FALSE) active = FALSE if(initial(uses) == 1) uses = initial(uses) diff --git a/code/modules/antagonists/abductor/equipment/glands/electric.dm b/code/modules/antagonists/abductor/equipment/glands/electric.dm index ee75ae48ce5..69226f3e4f2 100644 --- a/code/modules/antagonists/abductor/equipment/glands/electric.dm +++ b/code/modules/antagonists/abductor/equipment/glands/electric.dm @@ -11,7 +11,7 @@ ..() ADD_TRAIT(owner, TRAIT_SHOCKIMMUNE, "abductor_gland") -/obj/item/organ/internal/heart/gland/electric/Remove(mob/living/carbon/M, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/heart/gland/electric/Remove(mob/living/carbon/M, special = FALSE) REMOVE_TRAIT(owner, TRAIT_SHOCKIMMUNE, "abductor_gland") ..() diff --git a/code/modules/antagonists/abductor/equipment/glands/slime.dm b/code/modules/antagonists/abductor/equipment/glands/slime.dm index f049a90a44e..efb3a88c113 100644 --- a/code/modules/antagonists/abductor/equipment/glands/slime.dm +++ b/code/modules/antagonists/abductor/equipment/glands/slime.dm @@ -12,7 +12,7 @@ owner.faction |= "slime" owner.grant_language(/datum/language/slime, TRUE, TRUE, LANGUAGE_GLAND) -/obj/item/organ/internal/heart/gland/slime/Remove(mob/living/carbon/M, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/heart/gland/slime/Remove(mob/living/carbon/M, special = FALSE) owner.faction -= "slime" owner.remove_language(/datum/language/slime, TRUE, TRUE, LANGUAGE_GLAND) ..() diff --git a/code/modules/antagonists/nightmare/nightmare_organs.dm b/code/modules/antagonists/nightmare/nightmare_organs.dm index eb8d6aaca3c..19fc189b3fc 100644 --- a/code/modules/antagonists/nightmare/nightmare_organs.dm +++ b/code/modules/antagonists/nightmare/nightmare_organs.dm @@ -19,7 +19,7 @@ our_jaunt = new(M) our_jaunt.Grant(M) -/obj/item/organ/internal/brain/nightmare/Remove(mob/living/carbon/M, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/brain/nightmare/Remove(mob/living/carbon/M, special = FALSE) QDEL_NULL(our_jaunt) return ..() @@ -62,7 +62,7 @@ blade = new/obj/item/light_eater M.put_in_hands(blade) -/obj/item/organ/internal/heart/nightmare/Remove(mob/living/carbon/M, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/heart/nightmare/Remove(mob/living/carbon/M, special = FALSE) respawn_progress = 0 if(blade && special != HEART_SPECIAL_SHADOWIFY) M.visible_message(span_warning("\The [blade] disintegrates!")) diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index aa68582c072..67a0a03107e 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -184,7 +184,7 @@ var/datum/action/cooldown/spell/jaunt/bloodcrawl/crawl = new(M) crawl.Grant(M) -/obj/item/organ/internal/heart/demon/Remove(mob/living/carbon/M, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/heart/demon/Remove(mob/living/carbon/M, special = FALSE) ..() var/datum/action/cooldown/spell/jaunt/bloodcrawl/crawl = locate() in M.actions qdel(crawl) diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index aaff4d712f1..7ba153408cc 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -73,7 +73,7 @@ var/mob/living/carbon/alien/target_alien = organ_owner target_alien.updatePlasmaDisplay() -/obj/item/organ/internal/alien/plasmavessel/Remove(mob/living/carbon/organ_owner, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/alien/plasmavessel/Remove(mob/living/carbon/organ_owner, special = FALSE) ..() if(isalien(organ_owner)) var/mob/living/carbon/alien/organ_owner_alien = organ_owner @@ -96,7 +96,7 @@ organ_owner.faction |= ROLE_ALIEN ADD_TRAIT(organ_owner, TRAIT_XENO_IMMUNE, ORGAN_TRAIT) -/obj/item/organ/internal/alien/hivenode/Remove(mob/living/carbon/organ_owner, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/alien/hivenode/Remove(mob/living/carbon/organ_owner, special = FALSE) organ_owner.faction -= ROLE_ALIEN REMOVE_TRAIT(organ_owner, TRAIT_XENO_IMMUNE, ORGAN_TRAIT) ..() @@ -219,7 +219,7 @@ RegisterSignal(stomach_owner, COMSIG_ATOM_RELAYMOVE, .proc/something_moved) return ..() -/obj/item/organ/internal/stomach/alien/Remove(mob/living/carbon/stomach_owner, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/stomach/alien/Remove(mob/living/carbon/stomach_owner, special = FALSE) UnregisterSignal(stomach_owner, COMSIG_ATOM_RELAYMOVE) return ..() diff --git a/code/modules/surgery/organs/appendix.dm b/code/modules/surgery/organs/appendix.dm index ccedf3e5c61..38c5da586eb 100644 --- a/code/modules/surgery/organs/appendix.dm +++ b/code/modules/surgery/organs/appendix.dm @@ -72,7 +72,7 @@ /obj/item/organ/internal/appendix/get_availability(datum/species/owner_species) return !(TRAIT_NOHUNGER in owner_species.inherent_traits) -/obj/item/organ/internal/appendix/Remove(mob/living/carbon/organ_owner, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/appendix/Remove(mob/living/carbon/organ_owner, special = FALSE) REMOVE_TRAIT(organ_owner, TRAIT_DISEASELIKE_SEVERITY_MEDIUM, type) organ_owner.med_hud_set_status() ..() diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index fa7dbf2b1a1..989da10648b 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -116,7 +116,7 @@ var/stun_cap_amount = 40 -/obj/item/organ/internal/cyberimp/brain/anti_stun/Remove(mob/living/carbon/implant_owner, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/cyberimp/brain/anti_stun/Remove(mob/living/carbon/implant_owner, special = FALSE) . = ..() UnregisterSignal(implant_owner, signalCache) diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 4fef4d184d0..74a50b961c6 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -258,7 +258,7 @@ . = ..() ADD_TRAIT(eye_owner, TRAIT_XRAY_VISION, ORGAN_TRAIT) -/obj/item/organ/internal/eyes/robotic/xray/Remove(mob/living/carbon/eye_owner, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/eyes/robotic/xray/Remove(mob/living/carbon/eye_owner, special = FALSE) REMOVE_TRAIT(eye_owner, TRAIT_XRAY_VISION, ORGAN_TRAIT) return ..() @@ -542,7 +542,7 @@ . = ..() ADD_TRAIT(eye_owner, TRAIT_FLASH_SENSITIVE, ORGAN_TRAIT) -/obj/item/organ/internal/eyes/fly/Remove(mob/living/carbon/eye_owner, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/eyes/fly/Remove(mob/living/carbon/eye_owner, special = FALSE) REMOVE_TRAIT(eye_owner, TRAIT_FLASH_SENSITIVE, ORGAN_TRAIT) return ..() @@ -580,7 +580,7 @@ applyOrganDamage(-10) //heal quickly . = ..() -/obj/item/organ/internal/eyes/night_vision/maintenance_adapted/Remove(mob/living/carbon/unadapted, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/eyes/night_vision/maintenance_adapted/Remove(mob/living/carbon/unadapted, special = FALSE) //remove lighting adapt_light.on = FALSE adapt_light.update_brightness(unadapted) diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index a944e03e670..03494527924 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -142,7 +142,7 @@ if(owner) to_chat(owner, span_userdanger("Your heart has been replaced with a cursed one, you have to pump this one manually otherwise you'll die!")) -/obj/item/organ/internal/heart/cursed/Remove(mob/living/carbon/accursed, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/heart/cursed/Remove(mob/living/carbon/accursed, special = FALSE) ..() accursed.remove_client_colour(/datum/client_colour/cursed_heart_blood) @@ -282,7 +282,7 @@ RegisterSignal(owner, COMSIG_LIVING_POST_FULLY_HEAL, .proc/on_owner_fully_heal) RegisterSignal(owner, COMSIG_PARENT_QDELETING, .proc/owner_deleted) -/obj/item/organ/internal/heart/ethereal/Remove(mob/living/carbon/owner, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/heart/ethereal/Remove(mob/living/carbon/owner, special = FALSE) UnregisterSignal(owner, list(COMSIG_MOB_STATCHANGE, COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_PARENT_QDELETING)) REMOVE_TRAIT(owner, TRAIT_CORPSELOCKED, SPECIES_TRAIT) stop_crystalization_process(owner) diff --git a/code/modules/surgery/organs/stomach/stomach_ethereal.dm b/code/modules/surgery/organs/stomach/stomach_ethereal.dm index 376ba811173..c3249b0d7f4 100644 --- a/code/modules/surgery/organs/stomach/stomach_ethereal.dm +++ b/code/modules/surgery/organs/stomach/stomach_ethereal.dm @@ -18,7 +18,7 @@ RegisterSignal(owner, COMSIG_LIVING_ELECTROCUTE_ACT, .proc/on_electrocute) ADD_TRAIT(owner, TRAIT_NOHUNGER, REF(src)) -/obj/item/organ/internal/stomach/ethereal/Remove(mob/living/carbon/carbon, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/stomach/ethereal/Remove(mob/living/carbon/carbon, special = FALSE) UnregisterSignal(owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT) UnregisterSignal(owner, COMSIG_LIVING_ELECTROCUTE_ACT) REMOVE_TRAIT(owner, TRAIT_NOHUNGER, REF(src)) diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index d63b2a63d1f..a004de4c1ad 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -73,7 +73,7 @@ if(!sense_of_taste) ADD_TRAIT(tongue_owner, TRAIT_AGEUSIA, ORGAN_TRAIT) -/obj/item/organ/internal/tongue/Remove(mob/living/carbon/tongue_owner, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/tongue/Remove(mob/living/carbon/tongue_owner, special = FALSE) . = ..() if(say_mod && tongue_owner.dna && tongue_owner.dna.species) tongue_owner.dna.species.say_mod = initial(tongue_owner.dna.species.say_mod) @@ -490,7 +490,7 @@ ADD_TRAIT(signer, TRAIT_SIGN_LANG, ORGAN_TRAIT) REMOVE_TRAIT(signer, TRAIT_MUTE, ORGAN_TRAIT) -/obj/item/organ/internal/tongue/tied/Remove(mob/living/carbon/speaker, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/tongue/tied/Remove(mob/living/carbon/speaker, special = FALSE) ..() speaker.verb_ask = initial(speaker.verb_ask) speaker.verb_exclaim = initial(speaker.verb_exclaim) diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm index 6c55895be84..c4f9552c815 100644 --- a/code/modules/zombie/organs.dm +++ b/code/modules/zombie/organs.dm @@ -27,7 +27,7 @@ . = ..() START_PROCESSING(SSobj, src) -/obj/item/organ/internal/zombie_infection/Remove(mob/living/carbon/M, special = FALSE, drop_if_replaced = TRUE) +/obj/item/organ/internal/zombie_infection/Remove(mob/living/carbon/M, special = FALSE) . = ..() STOP_PROCESSING(SSobj, src) if(iszombie(M) && old_species && !special && !QDELETED(src))