Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Makes Mimicry Wiz spell usable #18166

Merged
Bibby0110 merged 2 commits into from
Mar 5, 2023
Merged

Makes Mimicry Wiz spell usable #18166

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5204efd
Makes cooldown higher
Lichton Mar 3, 2023
8529de0
Merge branch 'master' of https://github.com/yogstation13/Yogstation
Lichton Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/modules/spells/spell_types/disguise.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
invocation = "CONJR DIS GUISE"
invocation_type = "whisper"
school = "transmutation"
charge_max = 30 SECONDS
charge_max = 60 SECONDS
cooldown_min = 50 SECONDS
level_max = 2
cooldown_min = 25 SECONDS
clothes_req = FALSE
var/is_disguised = FALSE //Tells us if a disguise is currently up.
var/wasbeast = FALSE //We need this to make sure on can_cast, if they're found to be human and have this flag we can manually activate the uncloaking proc.
Expand Down Expand Up @@ -53,7 +53,7 @@
C.update_inv_hands()
log_game("[C.name] has disguised as [target.name]!")
is_disguised = TRUE
addtimer(CALLBACK(src, .proc/undocloak, C), (15 SECONDS + (spell_level * 3 SECONDS)))
addtimer(CALLBACK(src, .proc/undocloak, C), (40 SECONDS + (level * 3))) //Sets it up so this is unchanged on default level, and goes up per level invested.

/obj/effect/proc_holder/spell/disguise/proc/undocloak(var/mob/living/carbon/human/C) //Code shortcut to disable the disguise.
if((ishuman(C) && (C.mind)) || wasbeast == TRUE) //Shapeshift spell takes out your mind, buckles you to a body, and then puts your mind in a summoned animal. We need this bullshit to both check that this is not happening, and then override it when we have to fix the bullshit.
Expand Down