Skip to content

Commit

Permalink
Makes VV hallucination not shit (#27609)
Browse files Browse the repository at this point in the history
* Push because I forgor to merge master

* Fix

* Remove this
  • Loading branch information
DGamerL authored Dec 10, 2024
1 parent 3ff1323 commit 92c663e
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions code/datums/datumvars.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, "<span class='warning'>This can only be used on instances of type /mob/living/carbon</span>")
to_chat(usr, "<span class='warning'>This can only be used on instances of type /mob/living/carbon/human</span>")
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"]
Expand Down

0 comments on commit 92c663e

Please sign in to comment.