Skip to content

Commit

Permalink
Revert "Neotheology Taint (discordia-space#8064)" (discordia-space#8530)
Browse files Browse the repository at this point in the history
This reverts commit 20c694e.
  • Loading branch information
SirRichardFrancis authored Oct 13, 2024
1 parent 13dc696 commit 4fbdb96
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 37 deletions.
1 change: 0 additions & 1 deletion code/__DEFINES/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions code/modules/core_implant/core_implant.dm
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,3 @@

/obj/item/implant/core_implant/proc/get_rituals()
return known_rituals

/obj/item/implant/core_implant/proc/taint()
return
26 changes: 6 additions & 20 deletions code/modules/core_implant/cruciform/cruciform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/core_implant/cruciform/machinery/cloning.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions code/modules/mob/living/carbon/human/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down
8 changes: 0 additions & 8 deletions code/modules/mob/living/carbon/human/species/station/slime.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/slime/life.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Binary file removed icons/mob/human_races/r_tainted.dmi
Binary file not shown.

0 comments on commit 4fbdb96

Please sign in to comment.