diff --git a/code/datums/diseases/advance/presets.dm b/code/datums/diseases/advance/presets.dm index da8ad0d69a59..1924d92428e4 100644 --- a/code/datums/diseases/advance/presets.dm +++ b/code/datums/diseases/advance/presets.dm @@ -16,14 +16,6 @@ symptoms = list(new/datum/symptom/cough) ..() -/datum/disease/advance/necropolis - copy_type = /datum/disease/advance - -/datum/disease/advance/necropolis/New() - name = "Necropolis Seed" - symptoms = list(new/datum/symptom/necroseed) - ..() - //Randomly generated Disease, for virus crates and events /datum/disease/advance/random name = "Experimental Disease" diff --git a/code/datums/diseases/advance/symptoms/necropolis.dm b/code/datums/diseases/advance/symptoms/necropolis.dm deleted file mode 100644 index 9626b944124d..000000000000 --- a/code/datums/diseases/advance/symptoms/necropolis.dm +++ /dev/null @@ -1,113 +0,0 @@ -/datum/symptom/necroseed - name = "Necropolis Seed" - desc = "An infantile form of the root of Lavaland's tendrils. Forms a symbiotic bond with the host, making them stronger and hardier, at the cost of speed. Should the disease be cured, the host will be severely weakened." - stealth = 0 - resistance = 3 - stage_speed = -10 - transmittable = -3 - level = 9 - base_message_chance = 3 - severity = 0 - symptom_delay_min = 1 - symptom_delay_max = 1 - var/color = "#302f20" - var/tendrils = FALSE - var/chest = FALSE - var/fireproof = FALSE - threshold_descs = list( - "Resistance 15" = "The area near the host roils with paralyzing tendrils.", - "Resistance 20" = "Host becomes immune to heat, ash, and lava. Removes movespeed debuff. Hail to the necropolis!", - ) - var/list/cached_tentacle_turfs - var/turf/last_location - var/tentacle_recheck_cooldown = 100 - -/datum/symptom/necroseed/Start(datum/disease/advance/A) - . = ..() - if(!.) - return - if(A.totalResistance() >= 15) - tendrils = TRUE - if(A.totalResistance() >= 20) - fireproof = TRUE - -/datum/symptom/necroseed/Activate(datum/disease/advance/A) - . = ..() - if(!.) - return - var/mob/living/carbon/M = A.affected_mob - switch(A.stage) - if(1, 2) - if(tendrils) - tendril(A) - if(prob(base_message_chance)) - to_chat(M, "Your skin feels scaly.") - if(3, 4) - if(tendrils) - tendril(A) - if(prob(base_message_chance)) - to_chat(M, "[pick("Your skin is hard.", "You feel stronger.", "You feel powerful.", "You feel your muscles growing stiff.", "You feel warm.")]") - if(5) - if(tendrils) - tendril(A) - M.dna.species.punchdamagelow = 15 - M.dna.species.punchdamagehigh = 20 - M.dna.species.punchstunthreshold = 18 - M.dna.species.brutemod = 0.6 - M.dna.species.burnmod = 0.6 - M.dna.species.heatmod = 0.6 - M.add_atom_colour(color, FIXED_COLOUR_PRIORITY) - M.add_movespeed_modifier(/datum/movespeed_modifier/necropolis, update=TRUE) - ADD_TRAIT(M, TRAIT_PIERCEIMMUNE, DISEASE_TRAIT) - if(fireproof) - to_chat(M, "[pick("You taste primordial ash.", "The necropolis whispers sweet nothings to you.", "You feel like a god.")]") - ADD_TRAIT(M, TRAIT_RESISTHEAT, DISEASE_TRAIT) - ADD_TRAIT(M, TRAIT_RESISTHIGHPRESSURE, DISEASE_TRAIT) - M.weather_immunities |= "ash" - M.weather_immunities |= "lava" - M.remove_movespeed_modifier(/datum/movespeed_modifier/necropolis) - else - if(prob(base_message_chance)) - to_chat(M, "[pick("Your skin has become a hardened carapace.", "Your strength is superhuman.", "You feel invincible.")]") - if(tendrils) - tendril(A) - return - -/datum/symptom/necroseed/proc/tendril(datum/disease/advance/A) - . = A.affected_mob - var/mob/living/loc = A.affected_mob.loc - if(isturf(loc)) - if(!LAZYLEN(cached_tentacle_turfs) || loc != last_location || tentacle_recheck_cooldown <= world.time) - LAZYCLEARLIST(cached_tentacle_turfs) - last_location = loc - tentacle_recheck_cooldown = world.time + initial(tentacle_recheck_cooldown) - for(var/turf/open/T in orange(4, loc)) - LAZYADD(cached_tentacle_turfs, T) - for(var/t in cached_tentacle_turfs) - if(isopenturf(t)) - if(prob(10)) - new /obj/effect/temp_visual/goliath_tentacle(t, .) - else - cached_tentacle_turfs -= t - -/datum/symptom/necroseed/End(datum/disease/advance/A) - . = ..() - if(!.) - return - var/mob/living/carbon/M = A.affected_mob - to_chat(M, "You feel weakened as the necropolis' blessing leaves your body.") - M.remove_movespeed_modifier(/datum/movespeed_modifier/necropolis) - M.dna.species.punchdamagelow = initial(M.dna.species.punchdamagelow) - M.dna.species.punchdamagehigh = initial(M.dna.species.punchdamagehigh) - M.dna.species.punchstunthreshold = initial(M.dna.species.punchstunthreshold) - M.remove_atom_colour(color, FIXED_COLOUR_PRIORITY) - M.dna.species.brutemod /= 0.6 - M.dna.species.burnmod /= 0.6 - M.dna.species.heatmod /= 0.6 - REMOVE_TRAIT(M, TRAIT_PIERCEIMMUNE, DISEASE_TRAIT) - if(fireproof) - REMOVE_TRAIT(M, TRAIT_RESISTHIGHPRESSURE, DISEASE_TRAIT) - REMOVE_TRAIT(M, TRAIT_RESISTHEAT, DISEASE_TRAIT) - M.weather_immunities -= "ash" - M.weather_immunities -= "lava" - diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index e0c0d8a801ab..6e6c521fe445 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -316,14 +316,9 @@ move_resist = MOVE_RESIST_DEFAULT pull_force = PULL_FORCE_DEFAULT visible_message("[src] falls over with a mighty crash, the remaining legions within it falling apart!") - new /obj/item/crusher_trophy/legion_skull(loc) - new /obj/item/crusher_trophy/legion_skull(loc) - new /obj/item/crusher_trophy/legion_skull(loc) new /mob/living/simple_animal/hostile/asteroid/hivelord/legion(loc) new /mob/living/simple_animal/hostile/asteroid/hivelord/legion(loc) new /mob/living/simple_animal/hostile/asteroid/hivelord/legion(loc) - if(prob(45)) - new /obj/item/reagent_containers/glass/bottle/necropolis_seed(loc) ..(gibbed) /mob/living/simple_animal/hostile/big_legion/Initialize() diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index 5916fee4b44a..9a29efe1a381 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -275,13 +275,6 @@ desc = "A small bottle containing Bio Virus Antidote Kit." list_reagents = list(/datum/reagent/vaccine/fungal_tb = 30) -/obj/item/reagent_containers/glass/bottle/necropolis_seed - name = "bowl of blood" - desc = "A clay bowl containing a fledgling spire, preserved in blood. When consumed, allows the user to transform into an avatar of the Necropolis. A robust virologist may be able to unlock its full potential..." - icon = 'icons/obj/chemical/mortar.dmi' - icon_state = "mortar_bone" - spawned_disease = /datum/disease/advance/necropolis - //Oldstation.dmm chemical storage bottles /obj/item/reagent_containers/glass/bottle/hydrogen diff --git a/shiptest.dme b/shiptest.dme index 67c643cd7977..dc3ec1ce5b8b 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -617,7 +617,6 @@ #include "code\datums\diseases\advance\symptoms\itching.dm" #include "code\datums\diseases\advance\symptoms\nanites.dm" #include "code\datums\diseases\advance\symptoms\narcolepsy.dm" -#include "code\datums\diseases\advance\symptoms\necropolis.dm" #include "code\datums\diseases\advance\symptoms\oxygen.dm" #include "code\datums\diseases\advance\symptoms\sensory.dm" #include "code\datums\diseases\advance\symptoms\shedding.dm"