From 4fbdb9657de59d7b25a05cab6b6623ab78702999 Mon Sep 17 00:00:00 2001 From: SirRichardFrancis <65828539+SirRichardFrancis@users.noreply.github.com> Date: Mon, 14 Oct 2024 02:42:08 +0300 Subject: [PATCH] Revert "Neotheology Taint (#8064)" (#8530) This reverts commit 20c694e45b7576ea4995f5d9745dc2cd25c91c57. --- code/__DEFINES/mobs.dm | 1 - code/modules/core_implant/core_implant.dm | 3 -- .../core_implant/cruciform/cruciform.dm | 26 ++++-------------- .../cruciform/machinery/cloning.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 3 -- .../carbon/human/species/station/slime.dm | 8 ------ code/modules/mob/living/carbon/slime/life.dm | 2 +- icons/mob/human_races/r_tainted.dmi | Bin 9726 -> 0 bytes 8 files changed, 8 insertions(+), 37 deletions(-) delete mode 100644 icons/mob/human_races/r_tainted.dmi diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 594ee9ffdf9..063406b9c69 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -208,7 +208,6 @@ #define SPECIES_HUMAN "Human" #define SPECIES_SLIME "Slime" -#define SPECIES_TAINTED "Tainted" #define SPECIES_MONKEY "Monkey" #define SPECIES_GOLEM "Golem" #define SPECIES_SKELETON "Skeleton" diff --git a/code/modules/core_implant/core_implant.dm b/code/modules/core_implant/core_implant.dm index 2de514cdde5..6d7d62d3e40 100644 --- a/code/modules/core_implant/core_implant.dm +++ b/code/modules/core_implant/core_implant.dm @@ -219,6 +219,3 @@ /obj/item/implant/core_implant/proc/get_rituals() return known_rituals - -/obj/item/implant/core_implant/proc/taint() - return diff --git a/code/modules/core_implant/cruciform/cruciform.dm b/code/modules/core_implant/cruciform/cruciform.dm index 3cebddf3670..024bcf4860c 100644 --- a/code/modules/core_implant/cruciform/cruciform.dm +++ b/code/modules/core_implant/cruciform/cruciform.dm @@ -91,35 +91,23 @@ var/list/lost_cruciforms = list() s.set_up(3, 1, src) s.start() -/obj/item/implant/core_implant/cruciform/taint(mob/living/target) - var/mob/living/carbon/human/H = target - if(istype(H, /mob/living/carbon/human/dummy/mannequin)) - var/datum/mutation/U = new MUTATION_GODBLOOD - U.imprint(H) - else - if(H.species.name != SPECIES_TAINTED) - H.set_species(SPECIES_TAINTED) - /obj/item/implant/core_implant/cruciform/activate() var/observation_points = 200 if(!wearer || active) return - var/delayed_gib = FALSE - if(get_active_mutation(wearer, MUTATION_GODBLOOD) && !istype(wearer, /mob/living/carbon/human/dummy/mannequin)) + if(get_active_mutation(wearer, MUTATION_GODBLOOD)) spawn(2 MINUTES) for(var/mob/living/carbon/human/H in (disciples - wearer)) to_chat(H, SPAN_WARNING("A distant scream pierced your mind. You feel that a vile mutant sneaked among the faithful.")) playsound(wearer.loc, 'sound/hallucinations/veryfar_noise.ogg', 55, 1) - else if(wearer.get_species() != SPECIES_TAINTED || is_carrion(wearer)) + else if(wearer.get_species() != SPECIES_HUMAN || is_carrion(wearer)) if(wearer.get_species() == SPECIES_MONKEY) observation_points /= 20 playsound(wearer.loc, 'sound/hallucinations/wail.ogg', 55, 1) - if(is_carrion(wearer)) - wearer.gib() - if(eotp) // le mutants reward - eotp.addObservation(observation_points) - return - delayed_gib = TRUE + wearer.gib() + if(eotp) // le mutants reward + eotp.addObservation(observation_points) + return ..() add_module(new CRUCIFORM_COMMON) update_data() @@ -128,8 +116,6 @@ var/list/lost_cruciforms = list() var/datum/core_module/cruciform/cloning/M = get_module(CRUCIFORM_CLONING) if(M) M.write_wearer(wearer) //writes all needed data to cloning module - if(delayed_gib) // Allows cloning - wearer.gib() if(eotp) eotp.addObservation(observation_points*0.25) return TRUE diff --git a/code/modules/core_implant/cruciform/machinery/cloning.dm b/code/modules/core_implant/cruciform/machinery/cloning.dm index 12a6b2bd4dc..89c5bb00360 100644 --- a/code/modules/core_implant/cruciform/machinery/cloning.dm +++ b/code/modules/core_implant/cruciform/machinery/cloning.dm @@ -199,7 +199,7 @@ occupant.dna_trace = R.dna_trace occupant.dormant_mutations = R.dormant_mutations occupant.active_mutations = R.active_mutations - occupant.set_species(SPECIES_TAINTED) + occupant.set_species() occupant.real_name = R.real_name occupant.b_type = R.b_type occupant.age = R.age diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 419c92b6c8e..187e85dfe58 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1064,7 +1064,6 @@ var/list/rank_prefix = list(\ var/datum/category_item/setup_option/core_implant/I = Pref.get_option("Core implant") if(I.implant_type && (!mind || mind.assigned_role != "Robot")) var/obj/item/implant/core_implant/C = new I.implant_type - C.taint(src) C.install(src) C.activate() if(mind) @@ -1097,7 +1096,6 @@ var/list/rank_prefix = list(\ var/datum/category_item/setup_option/core_implant/I = client.prefs.get_option("Core implant") if(I.implant_type) var/obj/item/implant/core_implant/C = new I.implant_type - C.taint(src) C.install(src) C.activate() C.install_default_modules_by_job(mind.assigned_job) @@ -1115,7 +1113,6 @@ var/list/rank_prefix = list(\ /mob/living/carbon/human/proc/post_prefinit() var/obj/item/implant/core_implant/C = locate() in src if(C) - C.taint(src) C.install(src) C.activate() C.install_default_modules_by_job(mind.assigned_job) diff --git a/code/modules/mob/living/carbon/human/species/station/slime.dm b/code/modules/mob/living/carbon/human/species/station/slime.dm index b4d63749cdf..7a47cfb6a9f 100644 --- a/code/modules/mob/living/carbon/human/species/station/slime.dm +++ b/code/modules/mob/living/carbon/human/species/station/slime.dm @@ -81,11 +81,3 @@ var/datum/organ_description/OD = species.has_limbs[missing_limb_tag] OD.create_organ(src) to_chat(user, "You regenerate your [OD.name]") - -/datum/species/slime/tainted - name = SPECIES_TAINTED - name_plural = "tainteds" - blood_color = "#deff05" - flesh_color = "#babd19" - icobase = 'icons/mob/human_races/r_tainted.dmi' - deform = 'icons/mob/human_races/r_tainted.dmi' diff --git a/code/modules/mob/living/carbon/slime/life.dm b/code/modules/mob/living/carbon/slime/life.dm index c11c0b35245..d76531562ce 100644 --- a/code/modules/mob/living/carbon/slime/life.dm +++ b/code/modules/mob/living/carbon/slime/life.dm @@ -228,7 +228,7 @@ if(ishuman(L)) //Ignore slime(wo)men var/mob/living/carbon/human/H = L - if(H.species.name == SPECIES_SLIME || H.species.name == SPECIES_TAINTED) + if(H.species.name == SPECIES_SLIME) continue if(!L.canmove) // Only one slime can latch on at a time. diff --git a/icons/mob/human_races/r_tainted.dmi b/icons/mob/human_races/r_tainted.dmi deleted file mode 100644 index 815f42c1e70e0111f42b05b2df9433907da7fac8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9726 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