cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3151 from CHOMPStationBot/upstream-merge-11712

Browse Source 
[MIRROR] Customverb tweak
This commit is contained in:
Nadyr
2021-10-27 20:30:04 -04:00
committed by GitHub
parent 2b394a1bf0 530d461bf4
commit 5623c20563
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/client/preference_setup/vore/07_traits.dm
View File

@@ -112,12 +112,17 @@
else if(!pref.custom_base || !(pref.custom_base in GLOB.custom_species_bases)) else if(!pref.custom_base || !(pref.custom_base in GLOB.custom_species_bases))
pref.custom_base = SPECIES_HUMAN pref.custom_base = SPECIES_HUMAN
pref.custom_say = lowertext(trim(pref.custom_say))
pref.custom_whisper = lowertext(trim(pref.custom_whisper))
pref.custom_ask = lowertext(trim(pref.custom_ask))
pref.custom_exclaim = lowertext(trim(pref.custom_exclaim))
/datum/category_item/player_setup_item/vore/traits/copy_to_mob(var/mob/living/carbon/human/character) /datum/category_item/player_setup_item/vore/traits/copy_to_mob(var/mob/living/carbon/human/character)
character.custom_species = pref.custom_species character.custom_species = pref.custom_species
character.custom_say = pref.custom_say character.custom_say = lowertext(trim(pref.custom_say))
character.custom_ask = pref.custom_ask character.custom_ask = lowertext(trim(pref.custom_ask))
character.custom_whisper = pref.custom_whisper character.custom_whisper = lowertext(trim(pref.custom_whisper))
character.custom_exclaim = pref.custom_exclaim character.custom_exclaim = lowertext(trim(pref.custom_exclaim))
if(character.isSynthetic()) //Checking if we have a synth on our hands, boys. if(character.isSynthetic()) //Checking if we have a synth on our hands, boys.
pref.dirty_synth = 1 pref.dirty_synth = 1

8
code/modules/mob/living/living_vr.dm
View File

@@ -12,13 +12,13 @@
var/sayselect = tgui_alert(src, "Which say-verb do you wish to customize?", "Select Verb", list("Say","Whisper","Ask (?)","Exclaim/Shout/Yell (!)","Cancel")) var/sayselect = tgui_alert(src, "Which say-verb do you wish to customize?", "Select Verb", list("Say","Whisper","Ask (?)","Exclaim/Shout/Yell (!)","Cancel"))
if(sayselect == "Say") if(sayselect == "Say")
custom_say = sanitize(input(usr, "This word or phrase will appear instead of 'says': [src] says, \"Hi.\"", "Custom Say", null) as text) custom_say = lowertext(sanitize(input(usr, "This word or phrase will appear instead of 'says': [src] says, \"Hi.\"", "Custom Say", null) as text))
else if(sayselect == "Whisper") else if(sayselect == "Whisper")
custom_whisper = sanitize(input(usr, "This word or phrase will appear instead of 'whispers': [src] whispers, \"Hi...\"", "Custom Whisper", null) as text) custom_whisper = lowertext(sanitize(input(usr, "This word or phrase will appear instead of 'whispers': [src] whispers, \"Hi...\"", "Custom Whisper", null) as text))
else if(sayselect == "Ask (?)") else if(sayselect == "Ask (?)")
custom_ask = sanitize(input(usr, "This word or phrase will appear instead of 'asks': [src] asks, \"Hi?\"", "Custom Ask", null) as text) custom_ask = lowertext(sanitize(input(usr, "This word or phrase will appear instead of 'asks': [src] asks, \"Hi?\"", "Custom Ask", null) as text))
else if(sayselect == "Exclaim/Shout/Yell (!)") else if(sayselect == "Exclaim/Shout/Yell (!)")
custom_exclaim = sanitize(input(usr, "This word or phrase will appear instead of 'exclaims', 'shouts' or 'yells': [src] exclaims, \"Hi!\"", "Custom Exclaim", null) as text) custom_exclaim = lowertext(sanitize(input(usr, "This word or phrase will appear instead of 'exclaims', 'shouts' or 'yells': [src] exclaims, \"Hi!\"", "Custom Exclaim", null) as text))
else else
return return