From 92c663e1fff6899104636ea64e02e699a0afaaf6 Mon Sep 17 00:00:00 2001
From: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Tue, 10 Dec 2024 20:26:42 +0100
Subject: [PATCH] Makes VV hallucination not shit (#27609)
* Push because I forgor to merge master
* Fix
* Remove this
---
code/datums/datumvars.dm | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 46339343dd2..91541afc491 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -781,17 +781,15 @@
if(!check_rights(R_SERVER | R_EVENT))
return
- var/mob/living/carbon/C = locateUID(href_list["hallucinate"])
+ var/mob/living/carbon/human/C = locateUID(href_list["hallucinate"])
if(!istype(C))
- to_chat(usr, "This can only be used on instances of type /mob/living/carbon")
+ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
return
- var/haltype = input(usr, "Select the hallucination type:", "Hallucinate") as null|anything in subtypesof(/obj/effect/hallucination)
+ var/haltype = input(usr, "Select the hallucination type:", "Hallucinate") as null|anything in (subtypesof(/obj/effect/hallucination) + subtypesof(/datum/hallucination_manager))
if(!haltype)
return
- C.Hallucinate(20 SECONDS)
- var/datum/status_effect/transient/hallucination/H = C.has_status_effect(STATUS_EFFECT_HALLUCINATION)
- H.hallucinate(haltype)
+ C.invoke_hallucination(haltype)
message_admins("[key_name(usr)] has given [key_name(C)] the [haltype] hallucination")
log_admin("[key_name_admin(usr)] has given [key_name_admin(C)] the [haltype] hallucination")
href_list["datumrefresh"] = href_list["hallucinate"]