cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00: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:10 -04:00
committed by GitHub
parent f179146e86
commit 38a40b6ef6
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/client/preference_setup/vore/09_misc.dm
View File

@@ -58,15 +58,7 @@
pref.directory_erptag = new_erptag pref.directory_erptag = new_erptag
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["directory_ad"]) else if(href_list["directory_ad"])
<<<<<<< refs/remotes/Upstream/master
var/msg = sanitize(tgui_input_text(user,"Write your advertisement here!", "Flavor Text", html_decode(pref.directory_ad), multiline = TRUE), extra = 0) //VOREStation Edit: separating out OOC notes
=======
<<<<<<< HEAD
var/msg = sanitize(input(user,"Write your advertisement here!", "Flavor Text", html_decode(pref.directory_ad)) as message, extra = 0) //VOREStation Edit: separating out OOC notes
=======
var/msg = sanitize(tgui_input_text(user,"Write your advertisement here!", "Flavor Text", html_decode(pref.directory_ad), multiline = TRUE, prevent_enter = TRUE), extra = 0) //VOREStation Edit: separating out OOC notes var/msg = sanitize(tgui_input_text(user,"Write your advertisement here!", "Flavor Text", html_decode(pref.directory_ad), multiline = TRUE, prevent_enter = TRUE), extra = 0) //VOREStation Edit: separating out OOC notes
>>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
>>>>>>> Input Fixes
pref.directory_ad = msg pref.directory_ad = msg
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["toggle_sensor_setting"]) else if(href_list["toggle_sensor_setting"])