Adds wizard item: Plague Talisman #28150

EmeraldCandy · 2025-01-27T10:07:21Z

What Does This PR Do

Adds the Plague Talisman to the wizard's spellbook for 2 points. This item is intended a side-grade equivalent to the necromatic stone. When purchased, the wizard receives 5 plague talismans. When used on a corpse with a mind in it, the victim will be turned into a (NON-NECRO PLAGUE) zombie and is loyal to the wizard. Each zombie is given a disease upon their creation that they carry, to which they are able to spread via attacks with the given claw items. There is a 66% chance the disease will be minor (flu/cold/anxiety) with a 33% chance it will be a major disease (Beserker/cold9/brainrot). GBS/kuru/most transformation diseases have been left out.

Currently, the zombie claws do 35 force, which is 5 less than the claymores given by the necromatic stone, due to both having more potential zombies and the additions of the plagues. This can be changed as needed.

Additionally, makes wiz and zombies virus immune so they wont be affected by their own fun.

edit: Added an examine text about their rotted bodies to help identify them (besides claws) when they are fully clothed

Why It's Good For The Game

New wizard items are interesting, and more options for minions could be fun. These thralls are similar to the necromatic stone, though technically weaker than the weapons given to the skeleton thralls. However, zombies are unable to wield weaponry, and rely on their claws, thus preventing the wizard from giving out equipment to their new thralls (such as staffs of resurrection).

Images of changes

(I am very bad at spriting, feel free to ask me to replacing it)

Testing

Tested for converting alive/mindless/already slaved bodies
ensured proper mindslaving
ensured the victim gets the proper welcome message
ensured the claws summon as intended
ensured claws dispelled as intended
ensured claws inflicted diseases as intended
ensured each zombie was given their own individual disease
ensured zombies rot properly
ensured zombies revive properly
ensured zombies could not be given items
ensured mindless zombies dont spread the necro plague due to AI behavior

Declaration

I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

Changelog

🆑
add: Added plague talismans for the wizard
add: Added the plague claw spell for plague zombie use
imageadd: Plague talisman icon
/:cl:

Scribble-Sheep

Some grammar/spelling/flow touchups/suggestions.

code/game/gamemodes/wizard/artefact.dm

code/game/gamemodes/wizard/godhand.dm

code/game/gamemodes/wizard/spellbook.dm

code/game/objects/items/weapons/storage/belt.dm

code/modules/antagonists/zombie/zombie_spells.dm

Co-authored-by: Sheep <[email protected]> Signed-off-by: Kyani <[email protected]>

Scribble-Sheep · 2025-01-28T02:31:29Z

And also, I see this has been reworked from being a direct virus vector into more of a conversion spell. I like it~
Hopefully it'll be fun in practice.

TravisAngeI · 2025-01-28T04:37:08Z

I think the zombies should be told what virus they have on revival so they know what they're infecting people with, could have the minor zombies play defense with their 35 force claws and the major zombies play offense with their virus-y claws

code/game/gamemodes/wizard/artefact.dm

Co-authored-by: Luc <[email protected]> Signed-off-by: Kyani <[email protected]>

lewcc · 2025-01-31T17:04:33Z

code/game/gamemodes/wizard/artefact.dm

+
+//choose what disease this zombie will get
+/obj/item/plague_talisman/proc/pick_disease()
+	var picked_disease


Suggested change

var picked_disease

var/picked_disease

lewcc · 2025-01-31T17:05:32Z

code/game/gamemodes/wizard/artefact.dm

+	var/minor_length = length(minor_diseases)
+	var/major_length = length(major_diseases)
+	if(prob(66))
+		picked_disease = minor_diseases[rand(1, minor_length)]
+		return(picked_disease)
+	else
+		picked_disease = major_diseases[rand(1, major_length)]
+		return(picked_disease)


Suggested change

var/minor_length = length(minor_diseases)

var/major_length = length(major_diseases)

if(prob(66))

picked_disease = minor_diseases[rand(1, minor_length)]

return(picked_disease)

else

picked_disease = major_diseases[rand(1, major_length)]

return(picked_disease)

if(prob(66))

picked_disease = pick(minor_diseases)

else

picked_disease = pick(major_diseases)

return picked_disease

lewcc · 2025-01-31T17:05:47Z

code/game/objects/items/weapons/storage/belt.dm

+	use_item_overlays = TRUE
+	can_hold = list(
+		/obj/item/plague_talisman
+		)


Suggested change

)

)

lewcc · 2025-01-31T17:06:48Z

code/modules/antagonists/zombie/zombie_spells.dm

+	if(dispel())
+		return
+	var/obj/item/plague_claw/claws = new /obj/item/plague_claw(user.loc, src, disease)
+	if(user.get_organ("l_hand") && user.get_organ("r_hand")) // Takes always takes both hand slots, but doesnt require both


What happens if they're already holding something or their hands are full?

lewcc · 2025-01-31T17:07:29Z

code/modules/antagonists/zombie/zombie_spells.dm

+/datum/spell/plague_claws/can_cast(mob/user, charge_check, show_message)
+	var/mob/living/L = user
+	if(!L.get_active_hand() || istype(L.get_active_hand(), /obj/item/zombie_claw))
+		return ..()


should probably explicitly return false if that's what you want to have happen here otherwise

lewcc · 2025-01-31T17:07:58Z

code/modules/antagonists/zombie/zombie_spells.dm

+	return ..()
+
+/obj/item/plague_claw/customised_abstract_text(mob/living/carbon/owner)
+	return "<span class='warning'>[owner.p_they(TRUE)] [owner.p_have(FALSE)] sharp, ichor-laden claws extending from [owner.p_their(FALSE)] [owner.l_hand == src ? "left hand" : "right hand"].</span>"


Suggested change

return "<span class='warning'>[owner.p_they(TRUE)] [owner.p_have(FALSE)] sharp, ichor-laden claws extending from [owner.p_their(FALSE)] [owner.l_hand == src ? "left hand" : "right hand"].</span>"

return "<span class='warning'>[owner.p_they(TRUE)] [owner.p_have()] sharp, ichor-laden claws extending from [owner.p_their()] [owner.l_hand == src ? "left hand" : "right hand"].</span>"

lewcc · 2025-01-31T17:08:38Z

code/modules/antagonists/zombie/zombie_spells.dm

+	// already have the disease, or have contracted it.
+	if(!target.HasDisease(claw_disease))
+		playsound(user.loc, 'sound/misc/moist_impact.ogg', 50, TRUE)
+		target.bleed_rate = max(5, target.bleed_rate + 1) // Them claws sharp! Good luck with whatever they were laced with


Might want to make them bleed regardless when they get hit?

lewcc · 2025-01-31T17:08:53Z

code/modules/antagonists/zombie/zombie_spells.dm

+	if(..())
+		return
+	qdel(src)


What's this doing?

lewcc · 2025-01-31T17:09:44Z

code/modules/mob/living/carbon/examine.dm

@@ -306,6 +306,9 @@
 	if(reagents.has_reagent("teslium"))
 		msg += "[p_they(TRUE)] [p_are()] emitting a gentle blue glow!\n"

+	if(HAS_TRAIT(src, TRAIT_PLAGUE_ZOMBIE)) //to tell plague zombies easier through clothing
+		msg += "[p_they(TRUE)] smell like rot and death!\n"


This should make sure it shows up properly for he/she and they
"they smell like rot and death!"
"he smells like rot and death!"

Suggested change

msg += "[p_they(TRUE)] smell like rot and death!\n"

msg += "[p_they(TRUE)] smell[p_s()] like rot and death!\n"

EmeraldCandy added 9 commits January 21, 2025 22:19

first bits

4c89a95

moving to an item

b6a057c

progress

94e162f

more.... progress?

02723da

it works! now sprites

8cfceb5

sprite + bugfixing

c25d391

renaming

fbc0954

removed spacing

8e0451e

upgraded to advanced kingstons

e88c130

added examine text

841e43e

Scribble-Sheep reviewed Jan 28, 2025

View reviewed changes

EmeraldCandy and others added 6 commits January 27, 2025 21:28

Update code/game/gamemodes/wizard/artefact.dm

94e8ca0

Co-authored-by: Sheep <[email protected]> Signed-off-by: Kyani <[email protected]>

Update code/game/gamemodes/wizard/artefact.dm

cdc36bd

Co-authored-by: Sheep <[email protected]> Signed-off-by: Kyani <[email protected]>

Update code/game/gamemodes/wizard/artefact.dm

d36aa84

Co-authored-by: Sheep <[email protected]> Signed-off-by: Kyani <[email protected]>

Update code/game/gamemodes/wizard/godhand.dm

da86c01

Co-authored-by: Sheep <[email protected]> Signed-off-by: Kyani <[email protected]>

Update code/game/gamemodes/wizard/spellbook.dm

f17d22c

Co-authored-by: Sheep <[email protected]> Signed-off-by: Kyani <[email protected]>

Update code/game/objects/items/weapons/storage/belt.dm

798b1a1

Co-authored-by: Sheep <[email protected]> Signed-off-by: Kyani <[email protected]>

EmeraldCandy added 3 commits January 27, 2025 21:31

Update zombie_spells.dm

c937472

made the talisman smaller

ffc5048

this was leftovers. Deleted

039cef0

alerts zombies to their disease

194fbff

Burzah added the Balance This PR will modify how effective something is or isnt label Jan 28, 2025

ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting approval This PR is waiting for approval internally labels Jan 28, 2025

Merge branch 'master' into Plague-and-Pestilence

e9c2c2a

lewcc reviewed Jan 29, 2025

View reviewed changes

code/game/gamemodes/wizard/artefact.dm Outdated Show resolved Hide resolved

code/game/gamemodes/wizard/artefact.dm Outdated Show resolved Hide resolved

ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally and removed -Status: Awaiting review This PR is awaiting review from the review team labels Jan 29, 2025

EmeraldCandy and others added 2 commits January 29, 2025 23:50

Update code/game/gamemodes/wizard/artefact.dm

c07e4b1

Co-authored-by: Luc <[email protected]> Signed-off-by: Kyani <[email protected]>

updated to new attack chain

510437f

EmeraldCandy requested a review from lewcc January 30, 2025 07:16

EmeraldCandy added 2 commits January 30, 2025 02:30

I think this will work?...

bf14eb7

maybe this time + bugfix

ad719f7

lewcc reviewed Jan 31, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds wizard item: Plague Talisman #28150

Adds wizard item: Plague Talisman #28150

EmeraldCandy commented Jan 27, 2025 •

edited

Loading

Scribble-Sheep left a comment •

edited

Loading

Scribble-Sheep commented Jan 28, 2025

TravisAngeI commented Jan 28, 2025

lewcc Jan 31, 2025

lewcc Jan 31, 2025

lewcc Jan 31, 2025

lewcc Jan 31, 2025

lewcc Jan 31, 2025

lewcc Jan 31, 2025

lewcc Jan 31, 2025

lewcc Jan 31, 2025

lewcc Jan 31, 2025

	return "<span class='warning'>[owner.p_they(TRUE)] [owner.p_have(FALSE)] sharp, ichor-laden claws extending from [owner.p_their(FALSE)] [owner.l_hand == src ? "left hand" : "right hand"].</span>"
	return "<span class='warning'>[owner.p_they(TRUE)] [owner.p_have()] sharp, ichor-laden claws extending from [owner.p_their()] [owner.l_hand == src ? "left hand" : "right hand"].</span>"

	msg += "[p_they(TRUE)] smell like rot and death!\n"
	msg += "[p_they(TRUE)] smell[p_s()] like rot and death!\n"

Adds wizard item: Plague Talisman #28150

Are you sure you want to change the base?

Adds wizard item: Plague Talisman #28150

Conversation

EmeraldCandy commented Jan 27, 2025 • edited Loading

What Does This PR Do

Why It's Good For The Game

Images of changes

Testing

Declaration

Changelog

Scribble-Sheep left a comment • edited Loading

Choose a reason for hiding this comment

Scribble-Sheep commented Jan 28, 2025

TravisAngeI commented Jan 28, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

EmeraldCandy commented Jan 27, 2025 •

edited

Loading

Scribble-Sheep left a comment •

edited

Loading