mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 06:57:42 +01:00
Adds wizard item: Plague Talisman (#28150)
* first bits * moving to an item * progress * more.... progress? * it works! now sprites * sprite + bugfixing * renaming * removed spacing * upgraded to advanced kingstons * added examine text * Update code/game/gamemodes/wizard/artefact.dm Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/gamemodes/wizard/artefact.dm Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/gamemodes/wizard/artefact.dm Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/gamemodes/wizard/godhand.dm Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/gamemodes/wizard/spellbook.dm Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/belt.dm Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update zombie_spells.dm * made the talisman smaller * this was leftovers. Deleted * alerts zombies to their disease * Update code/game/gamemodes/wizard/artefact.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * updated to new attack chain * I think this will work?... * maybe this time + bugfix * Update code/game/gamemodes/wizard/artefact.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/gamemodes/wizard/artefact.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/belt.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/modules/antagonists/zombie/zombie_spells.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/modules/mob/living/carbon/examine.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * fixed some reviews * new sprite!!!! * reworkin it * oops spacing * more rework. claws dont work no mo * FINALLY * fixed indent * fixed an exploit + comments * forgot to save this * beginning rework * Update wizard_diseases.dm * Update wizard_diseases.dm * finished the diseases * removed unused proc * removed brainrot * misc fixes * adds diseases to blacklist * fixed the empty box * silent already exists, bah * reworked, per contra * more fixing * Update code/datums/diseases/wizard_diseases.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/datums/diseases/wizard_diseases.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/datums/diseases/zombie_virus.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/gamemodes/wizard/artefact.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/gamemodes/wizard/artefact.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/modules/antagonists/zombie/zombie_spells.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/modules/antagonists/zombie/zombie_spells.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/gamemodes/wizard/artefact.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/datums/diseases/wizard_diseases.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * small tweaks * fix + tweak * rework + revive tweak * tweaks * tweaks * slight tweak * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * review fixes * Update artefact.dm * Update code/game/gamemodes/wizard/artefact.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/gamemodes/wizard/artefact.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/datums/diseases/wizard_diseases.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * small tweaks * lower regen. why was this so high * linter * linter --------- Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
Kyani
co-authored by
Sheep
Luc
Burzah
Sheep
Luc
Burzah
parent
a5d523b4a1
commit
b1b3eee1dc
@@ -777,7 +777,7 @@
|
||||
ask_verb = "groans"
|
||||
exclaim_verbs = list("yells")
|
||||
colour = "zombie"
|
||||
key = "zz" //doesn't matter, this is their default and only language
|
||||
key = "w"
|
||||
flags = RESTRICTED | NOLIBRARIAN
|
||||
syllables = list("Brains", "Brainssss", "Flesh", "Grrr", "Hnng", "Braaaains", "Braaiiiins")
|
||||
english_names = TRUE
|
||||
|
||||
@@ -639,7 +639,8 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
|
||||
var/atom/movable/AM = hit_atom
|
||||
var/atom/throw_target = get_edge_target_turf(AM, dir)
|
||||
if(!AM.anchored || ismecha(AM))
|
||||
AM.throw_at(throw_target, 5, 12, src)
|
||||
if(!HAS_TRAIT(src, TRAIT_PLAGUE_ZOMBIE))
|
||||
AM.throw_at(throw_target, 5, 12, src)
|
||||
hit_something = TRUE
|
||||
if(isobj(hit_atom))
|
||||
var/obj/O = hit_atom
|
||||
@@ -647,10 +648,16 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
|
||||
hit_something = TRUE
|
||||
if(isliving(hit_atom))
|
||||
var/mob/living/L = hit_atom
|
||||
L.adjustBruteLoss(60)
|
||||
L.KnockDown(12 SECONDS)
|
||||
L.Confused(10 SECONDS)
|
||||
shake_camera(L, 4, 3)
|
||||
if(HAS_TRAIT(src, TRAIT_PLAGUE_ZOMBIE))
|
||||
var/obj/item/I = src.get_active_hand()
|
||||
if(I)
|
||||
I.attack(L, src)
|
||||
L.KnockDown(1 SECONDS)
|
||||
else
|
||||
L.adjustBruteLoss(60)
|
||||
L.KnockDown(12 SECONDS)
|
||||
L.Confused(10 SECONDS)
|
||||
hit_something = TRUE
|
||||
if(isturf(hit_atom))
|
||||
var/turf/T = hit_atom
|
||||
@@ -658,8 +665,8 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
|
||||
T.dismantle_wall(TRUE)
|
||||
hit_something = TRUE
|
||||
if(hit_something)
|
||||
visible_message("<span class='danger'>[src] slams into [hit_atom]!</span>", "<span class='userdanger'>You slam into [hit_atom]!</span>")
|
||||
playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 100, TRUE)
|
||||
visible_message("<span class='danger'>[src] slams into [hit_atom]!</span>", "<span class='userdanger'>You slam into [hit_atom]!</span>")
|
||||
return
|
||||
if(has_status_effect(STATUS_EFFECT_IMPACT_IMMUNE))
|
||||
return
|
||||
|
||||
@@ -308,6 +308,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[p_s()] like rot and death!\n"
|
||||
|
||||
// add in anything else we want at the end of this block
|
||||
msg += examine_extra_damage_flavor()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user