From e1b32c5af22029c7e41aad2447cfc0b75631d92f Mon Sep 17 00:00:00 2001 From: SomeguyManperson Date: Sun, 9 Jan 2022 23:28:47 -0500 Subject: [PATCH 1/2] someone fucking broke tails again thanks guys --- code/modules/surgery/organs/tails.dm | 174 +++++++++++++-------------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/code/modules/surgery/organs/tails.dm b/code/modules/surgery/organs/tails.dm index 149d15941549..782947f9936b 100644 --- a/code/modules/surgery/organs/tails.dm +++ b/code/modules/surgery/organs/tails.dm @@ -1,87 +1,87 @@ -// Note: tails only work in humans. They use human-specific parameters and rely on human code for displaying. - -/obj/item/organ/tail - name = "tail" - desc = "A severed tail. What did you cut this off of?" - icon_state = "severedtail" - zone = BODY_ZONE_PRECISE_GROIN - slot = ORGAN_SLOT_TAIL - var/tail_type = "None" - -/obj/item/organ/tail/Remove(mob/living/carbon/human/H, special = 0) - ..() - if(H && H.dna && H.dna.species) - H.dna.species.stop_wagging_tail(H) - -/obj/item/organ/tail/cat - name = "cat tail" - desc = "A severed cat tail. Who's wagging now?" - tail_type = "Cat" - -/obj/item/organ/tail/cat/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE) - ..() - if(istype(H)) - if(!("tail_human" in H.dna.species.mutant_bodyparts)) - H.dna.species.mutant_bodyparts |= "tail_human" - H.dna.features["tail_human"] = tail_type - H.update_body() - -/obj/item/organ/tail/cat/Remove(mob/living/carbon/human/H, special = 0) - ..() - if(istype(H)) - H.dna.features["tail_human"] = "None" - H.dna.species.mutant_bodyparts -= "tail_human" - color = H.hair_color - H.update_body() - -/obj/item/organ/tail/lizard - name = "lizard tail" - desc = "A severed lizard tail. Somewhere, no doubt, a lizard hater is very pleased with themselves." - icon_state = "severedlizardtail" //yogs - so the tail uses the correct sprites - color = "#116611" - tail_type = "Smooth" - var/spines = "None" - -/obj/item/organ/tail/lizard/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE) - ..() - if(istype(H)) - // Checks here are necessary so it wouldn't overwrite the tail of a lizard it spawned in - if(!("tail_lizard" in H.dna.species.mutant_bodyparts)) - H.dna.features["tail_lizard"] = tail_type - H.dna.species.mutant_bodyparts |= "tail_lizard" - - if(!("spines" in H.dna.species.mutant_bodyparts)) - H.dna.features["spines"] = spines - H.dna.species.mutant_bodyparts |= "spines" - H.update_body() - -/obj/item/organ/tail/lizard/Remove(mob/living/carbon/human/H, special = 0) - ..() - if(istype(H)) - H.dna.species.mutant_bodyparts -= "tail_lizard" - H.dna.species.mutant_bodyparts -= "spines" - color = "#" + H.dna.features["mcolor"] - tail_type = H.dna.features["tail_lizard"] - spines = H.dna.features["spines"] - H.update_body() - -/obj/item/organ/tail/polysmorph - name = "polysmorph tail" - desc = "A severed polysmorph tail." - icon_state = "severedpolytail" //yogs - so the tail uses the correct sprites - tail_type = "Polys" - -/obj/item/organ/tail/polysmorph/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = FALSE) - ..() - if(istype(H)) - if(!("tail_polysmorph" in H.dna.species.mutant_bodyparts)) - H.dna.features["tail_polysmorph"] = tail_type - H.dna.species.mutant_bodyparts |= "tail_polysmorph" - H.update_body() - -/obj/item/organ/tail/polysmorph/Remove(mob/living/carbon/human/H, special = 0) - ..() - if(istype(H)) - H.dna.species.mutant_bodyparts -= "tail_polysmorph" - tail_type = H.dna.features["tail_polysmorph"] - H.update_body() +// Note: tails only work in humans. They use human-specific parameters and rely on human code for displaying. + +/obj/item/organ/tail + name = "tail" + desc = "A severed tail. What did you cut this off of?" + icon_state = "severedtail" + zone = BODY_ZONE_PRECISE_GROIN + slot = ORGAN_SLOT_TAIL + var/tail_type = "None" + +/obj/item/organ/tail/Remove(mob/living/carbon/human/H, special = 0) + ..() + if(H && H.dna && H.dna.species) + H.dna.species.stop_wagging_tail(H) + +/obj/item/organ/tail/cat + name = "cat tail" + desc = "A severed cat tail. Who's wagging now?" + tail_type = "Cat" + +/obj/item/organ/tail/cat/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE) + ..() + if(istype(H)) + if(!("tail_human" in H.dna.species.mutant_bodyparts)) + H.dna.species.mutant_bodyparts |= "tail_human" + H.dna.features["tail_human"] = tail_type + H.update_body() + +/obj/item/organ/tail/cat/Remove(mob/living/carbon/human/H, special = 0) + ..() + if(istype(H)) + H.dna.features["tail_human"] = "None" + H.dna.species.mutant_bodyparts -= "tail_human" + color = H.hair_color + H.update_body() + +/obj/item/organ/tail/lizard + name = "lizard tail" + desc = "A severed lizard tail. Somewhere, no doubt, a lizard hater is very pleased with themselves." + icon_state = "severedlizardtail" //yogs - so the tail uses the correct sprites + color = "#116611" + tail_type = "Smooth" + var/spines = "None" + +/obj/item/organ/tail/lizard/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE) + ..() + if(istype(H)) + // Checks here are necessary so it wouldn't overwrite the tail of a lizard it spawned in + if(!("tail_lizard" in H.dna.species.mutant_bodyparts)) + H.dna.features["tail_lizard"] = tail_type + H.dna.species.mutant_bodyparts |= "tail_lizard" + + if(!("spines" in H.dna.species.mutant_bodyparts)) + H.dna.features["spines"] = spines + H.dna.species.mutant_bodyparts |= "spines" + H.update_body() + +/obj/item/organ/tail/lizard/Remove(mob/living/carbon/human/H, special = 0) + ..() + if(istype(H)) + H.dna.species.mutant_bodyparts -= "tail_lizard" + H.dna.species.mutant_bodyparts -= "spines" + color = "#" + H.dna.features["mcolor"] + tail_type = H.dna.features["tail_lizard"] + spines = H.dna.features["spines"] + H.update_body() + +/obj/item/organ/tail/polysmorph + name = "polysmorph tail" + desc = "A severed polysmorph tail." + icon_state = "severedpolytail" //yogs - so the tail uses the correct sprites + tail_type = "Polys" + +/obj/item/organ/tail/polysmorph/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = FALSE) + ..() + if(istype(H)) + if(!("tail_polysmorph" in H.dna.species.mutant_bodyparts)) + H.dna.features["tail_polysmorph"] = tail_type + H.dna.species.mutant_bodyparts |= "tail_polysmorph" + H.update_body() + +/obj/item/organ/tail/polysmorph/Remove(mob/living/carbon/human/H, special = 0) + ..() + if(istype(H)) + H.dna.species.mutant_bodyparts -= "tail_polysmorph" + tail_type = H.dna.features["tail_polysmorph"] + H.update_body() From 5ed964a0f04f1b17a5f94f1a86e7fc49acd41bac Mon Sep 17 00:00:00 2001 From: SomeguyManperson Date: Wed, 2 Feb 2022 23:47:17 -0500 Subject: [PATCH 2/2] fix heretic --- code/modules/antagonists/eldritch_cult/eldritch_effects.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm index 89f3cc2e2805..90c4491c8b93 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm @@ -152,7 +152,7 @@ var/obj/effect/reality_smash/current_fracture = locate() in range(1, chosen_location) var/obj/effect/broken_illusion/current_burnt_fracture = locate() in range(1, chosen_location) var/obj/structure/window/windowsxp = locate() in range(1, chosen_location) - if(current_fracture || current_burnt_fracture || windowsxp.fulltile) //we dont want to spawn + if(current_fracture || current_burnt_fracture || windowsxp?.fulltile) //we dont want to spawn continue new /obj/effect/reality_smash(chosen_location) ReworkNetwork()