cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 05:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-06-23 00:11:34 -04:00
committed by GitHub
parent 38a40b6ef6
commit e9e8fe478c
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/verbs/character_directory.dm
+1 -9
View File
@@ -151,16 +151,8 @@ GLOBAL_DATUM(character_directory, /datum/character_directory)
return
var/current_ad = usr.client.prefs.directory_ad
<<<<<<< refs/remotes/Upstream/master
var/new_ad = sanitize(tgui_input_text(usr, "Change your character ad", "Character Ad", current_ad, multiline = TRUE), extra = 0)
=======
<<<<<<< HEAD
var/new_ad = sanitize(input(usr, "Change your character ad", "Character Ad", current_ad) as message|null, extra = 0)
=======
var/new_ad = sanitize(tgui_input_text(usr, "Change your character ad", "Character Ad", current_ad, multiline = TRUE, prevent_enter = TRUE), extra = 0)
>>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
>>>>>>> Input Fixes
if(isnull(new_ad))
return
usr.client.prefs.directory_ad = new_ad
return TRUE
return TRUE