cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

pvp enabled (#17934)

Browse Source
This commit is contained in:
ynot01
2023-02-18 01:58:49 -05:00
committed by GitHub
parent cfe754a9a5
commit 2761924c1b
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/datums/saymode.dm
View File

@@ -15,6 +15,9 @@
mode = MODE_CHANGELING mode = MODE_CHANGELING
/datum/saymode/changeling/handle_message(mob/living/user, message, datum/language/language) /datum/saymode/changeling/handle_message(mob/living/user, message, datum/language/language)
if(ismob(user.pulledby) && is_changeling(user.pulledby) && user.pulledby.grab_state >= GRAB_NECK)
to_chat(user, span_warning("Our abilities are being dampened! We cannot speak through the hivemind!"))
return FALSE
switch(user.lingcheck()) switch(user.lingcheck())
if(LINGHIVE_LINK) if(LINGHIVE_LINK)
var/msg = span_changeling("<b>[user.mind]:</b> [message]") var/msg = span_changeling("<b>[user.mind]:</b> [message]")

5
code/modules/antagonists/changeling/powers/headcrab.dm
View File

@@ -11,7 +11,10 @@
/datum/action/changeling/headcrab/sting_action(mob/user) /datum/action/changeling/headcrab/sting_action(mob/user)
set waitfor = FALSE set waitfor = FALSE
if(tgui_alert(usr,"Are we sure we wish to kill ourself and create a headslug?",,list("Yes", "No")) == "No") if(ismob(user.pulledby) && is_changeling(user.pulledby) && user.pulledby.grab_state >= GRAB_NECK)
to_chat(user, span_warning("Our abilities are being dampened! We cannot use [src]!"))
return
if(tgui_alert(usr,"Are we sure we wish to kill ourself and create a headslug?",,list("Yes", "No")) != "Yes")
return return
..() ..()
var/datum/mind/M = user.mind var/datum/mind/M = user.mind