mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Merge pull request #14018 from BonniePandora/Text-box-QoL-stuff
Various text-box QoL stuff
This commit is contained in:
@@ -116,7 +116,7 @@
|
|||||||
|
|
||||||
///// PSAY /////
|
///// PSAY /////
|
||||||
|
|
||||||
/mob/verb/psay(message as text|null)
|
/mob/verb/psay(message as text)
|
||||||
set category = "IC"
|
set category = "IC"
|
||||||
set name = "Psay"
|
set name = "Psay"
|
||||||
set desc = "Talk to people affected by complete absorbed or dominate predator/prey."
|
set desc = "Talk to people affected by complete absorbed or dominate predator/prey."
|
||||||
@@ -221,7 +221,7 @@
|
|||||||
|
|
||||||
///// PME /////
|
///// PME /////
|
||||||
|
|
||||||
/mob/verb/pme(message as text|null)
|
/mob/verb/pme(message as message)
|
||||||
set category = "IC"
|
set category = "IC"
|
||||||
set name = "Pme"
|
set name = "Pme"
|
||||||
set desc = "Emote to people affected by complete absorbed or dominate predator/prey."
|
set desc = "Emote to people affected by complete absorbed or dominate predator/prey."
|
||||||
@@ -324,7 +324,7 @@
|
|||||||
M.forced_psay = FALSE
|
M.forced_psay = FALSE
|
||||||
M.me_verb(message)
|
M.me_verb(message)
|
||||||
|
|
||||||
/mob/living/verb/player_narrate(message as text|null)
|
/mob/living/verb/player_narrate(message as message)
|
||||||
set category = "IC"
|
set category = "IC"
|
||||||
set name = "Narrate (Player)"
|
set name = "Narrate (Player)"
|
||||||
set desc = "Narrate an action or event! An alternative to emoting, for when your emote shouldn't start with your name!"
|
set desc = "Narrate an action or event! An alternative to emoting, for when your emote shouldn't start with your name!"
|
||||||
|
|||||||
@@ -469,17 +469,17 @@
|
|||||||
|
|
||||||
///////////////////
|
///////////////////
|
||||||
//Verbs for humans
|
//Verbs for humans
|
||||||
/mob/proc/nsay(message as text|null)
|
/mob/proc/nsay(message as text)
|
||||||
set name = "NSay"
|
set name = "NSay"
|
||||||
set desc = "Speak into your NIF's Soulcatcher."
|
set desc = "Speak into your NIF's Soulcatcher."
|
||||||
set category = "IC"
|
set category = "IC"
|
||||||
|
|
||||||
src.nsay_act(message)
|
src.nsay_act(message)
|
||||||
|
|
||||||
/mob/proc/nsay_act(message as text|null)
|
/mob/proc/nsay_act(message as text)
|
||||||
to_chat(src, SPAN_WARNING("You must be a humanoid with a NIF implanted to use that."))
|
to_chat(src, SPAN_WARNING("You must be a humanoid with a NIF implanted to use that."))
|
||||||
|
|
||||||
/mob/living/carbon/human/nsay_act(message as text|null)
|
/mob/living/carbon/human/nsay_act(message as text)
|
||||||
if(stat != CONSCIOUS)
|
if(stat != CONSCIOUS)
|
||||||
to_chat(src,SPAN_WARNING("You can't use NSay while unconscious."))
|
to_chat(src,SPAN_WARNING("You can't use NSay while unconscious."))
|
||||||
return
|
return
|
||||||
@@ -499,17 +499,17 @@
|
|||||||
var/sane_message = sanitize(message)
|
var/sane_message = sanitize(message)
|
||||||
SC.say_into(sane_message,src)
|
SC.say_into(sane_message,src)
|
||||||
|
|
||||||
/mob/proc/nme(message as text|null)
|
/mob/proc/nme(message as message)
|
||||||
set name = "NMe"
|
set name = "NMe"
|
||||||
set desc = "Emote into your NIF's Soulcatcher."
|
set desc = "Emote into your NIF's Soulcatcher."
|
||||||
set category = "IC"
|
set category = "IC"
|
||||||
|
|
||||||
src.nme_act(message)
|
src.nme_act(message)
|
||||||
|
|
||||||
/mob/proc/nme_act(message as text|null)
|
/mob/proc/nme_act(message as message)
|
||||||
to_chat(src, SPAN_WARNING("You must be a humanoid with a NIF implanted to use that."))
|
to_chat(src, SPAN_WARNING("You must be a humanoid with a NIF implanted to use that."))
|
||||||
|
|
||||||
/mob/living/carbon/human/nme_act(message as text|null)
|
/mob/living/carbon/human/nme_act(message as message)
|
||||||
if(stat != CONSCIOUS)
|
if(stat != CONSCIOUS)
|
||||||
to_chat(src,SPAN_WARNING("You can't use NMe while unconscious."))
|
to_chat(src,SPAN_WARNING("You can't use NMe while unconscious."))
|
||||||
return
|
return
|
||||||
@@ -574,7 +574,7 @@
|
|||||||
QDEL_NULL(eyeobj)
|
QDEL_NULL(eyeobj)
|
||||||
soulcatcher.notify_into("[src] ended AR projection.")
|
soulcatcher.notify_into("[src] ended AR projection.")
|
||||||
|
|
||||||
/mob/living/carbon/brain/caught_soul/verb/nsay_brain(message as text|null)
|
/mob/living/carbon/brain/caught_soul/verb/nsay_brain(message as text)
|
||||||
set name = "NSay"
|
set name = "NSay"
|
||||||
set desc = "Speak into the NIF's Soulcatcher (circumventing AR speaking)."
|
set desc = "Speak into the NIF's Soulcatcher (circumventing AR speaking)."
|
||||||
set category = "Soulcatcher"
|
set category = "Soulcatcher"
|
||||||
@@ -585,7 +585,7 @@
|
|||||||
var/sane_message = sanitize(message)
|
var/sane_message = sanitize(message)
|
||||||
soulcatcher.say_into(sane_message,src,null)
|
soulcatcher.say_into(sane_message,src,null)
|
||||||
|
|
||||||
/mob/living/carbon/brain/caught_soul/verb/nme_brain(message as text|null)
|
/mob/living/carbon/brain/caught_soul/verb/nme_brain(message as message)
|
||||||
set name = "NMe"
|
set name = "NMe"
|
||||||
set desc = "Emote into the NIF's Soulcatcher (circumventing AR speaking)."
|
set desc = "Emote into the NIF's Soulcatcher (circumventing AR speaking)."
|
||||||
set category = "Soulcatcher"
|
set category = "Soulcatcher"
|
||||||
|
|||||||
Reference in New Issue
Block a user