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

Remove many incorrect uses of usr (#8296)

Browse Source
This commit is contained in:
Raeschen
2024-04-25 16:33:15 +02:00
committed by GitHub
parent 4436ea38d3
commit 8d04b28ec2
22 changed files with 250 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/machinery/camera/tracking.dm
View File

@@ -102,12 +102,12 @@
var/list/cameras = list() var/list/cameras = list()
/mob/living/silicon/ai/proc/trackable_mobs() /mob/living/silicon/ai/proc/trackable_mobs()
if(usr.stat == 2) if(src.stat == 2) //ChompEDIT usr --> src
return list() return list()
var/datum/trackable/TB = new() var/datum/trackable/TB = new()
for(var/mob/living/M in mob_list) for(var/mob/living/M in mob_list)
if(M == usr) if(M == src) //ChompEDIT usr --> src
continue continue
if(M.tracking_status() != TRACKING_POSSIBLE) if(M.tracking_status() != TRACKING_POSSIBLE)
continue continue
@@ -153,7 +153,7 @@
/mob/living/silicon/ai/proc/ai_actual_track(mob/living/target as mob) /mob/living/silicon/ai/proc/ai_actual_track(mob/living/target as mob)
if(!istype(target)) return FALSE if(!istype(target)) return FALSE
var/mob/living/silicon/ai/U = usr var/mob/living/silicon/ai/U = src //ChompEDIT usr --> src
if(target == U.cameraFollow) if(target == U.cameraFollow)
return TRUE return TRUE

2
code/game/objects/items/devices/communicator/communicator.dm
View File

@@ -153,7 +153,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
if (ismob(loc)) if (ismob(loc))
var/mob/M = loc var/mob/M = loc
M.put_in_hands(id) M.put_in_hands(id)
to_chat(usr, "<span class='notice'>You remove the ID from the [name].</span>") to_chat(M, "<span class='notice'>You remove the ID from the [name].</span>") //ChompEDIT usr --> M
playsound(src, 'sound/machines/id_swipe.ogg', 100, 1) playsound(src, 'sound/machines/id_swipe.ogg', 100, 1)
else else
id.loc = get_turf(src) id.loc = get_turf(src)

4
code/game/objects/items/devices/spy_bug.dm
View File

@@ -191,7 +191,7 @@
operating = 1 operating = 1
while(selected_camera && Adjacent(user)) while(selected_camera && Adjacent(user))
selected_camera = tgui_input_list(usr, "Select camera to view.", "Camera Choice", cameras) selected_camera = tgui_input_list(user, "Select camera to view.", "Camera Choice", cameras) //ChompEDIT usr --> src
selected_camera = null selected_camera = null
operating = 0 operating = 0
@@ -272,4 +272,4 @@
canhear_range = 1 canhear_range = 1
name = "spy device" name = "spy device"
icon_state = "syn_cypherkey" icon_state = "syn_cypherkey"
*/ */

12
code/modules/client/preference_setup/general/01_basic.dm
View File

@@ -142,7 +142,7 @@
return TOPIC_NOACTION return TOPIC_NOACTION
else if(href_list["reset_nickname"]) else if(href_list["reset_nickname"])
var/nick_choice = tgui_alert(usr, "Wipe your Nickname? This will completely remove any chosen nickname(s).","Wipe Nickname",list("Yes","No")) var/nick_choice = tgui_alert(user, "Wipe your Nickname? This will completely remove any chosen nickname(s).","Wipe Nickname",list("Yes","No")) //ChompEDIT - usr removal
if(nick_choice == "Yes") if(nick_choice == "Yes")
pref.nickname = null pref.nickname = null
return TOPIC_REFRESH return TOPIC_REFRESH
@@ -229,30 +229,30 @@
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["edit_ooc_notes"]) else if(href_list["edit_ooc_notes"])
var/new_metadata = strip_html_simple(tgui_input_text(usr, "Enter any information you'd like others to see, such as Roleplay-preferences. This will not be saved permanently unless you click save in the Character Setup panel!", "Game Preference" , html_decode(pref.metadata), multiline = TRUE, prevent_enter = TRUE)) var/new_metadata = strip_html_simple(tgui_input_text(user, "Enter any information you'd like others to see, such as Roleplay-preferences. This will not be saved permanently unless you click save in the Character Setup panel!", "Game Preference" , html_decode(pref.metadata), multiline = TRUE, prevent_enter = TRUE)) //ChompEDIT - usr removal
if(new_metadata && CanUseTopic(user)) if(new_metadata && CanUseTopic(user))
pref.metadata = new_metadata pref.metadata = new_metadata
else if(href_list["edit_ooc_note_likes"]) else if(href_list["edit_ooc_note_likes"])
var/new_metadata = strip_html_simple(tgui_input_text(usr, "Enter any information you'd like others to see relating to your LIKED roleplay preferences. This will not be saved permanently unless you click save in the Character Setup panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(pref.metadata_likes), multiline = TRUE, prevent_enter = TRUE)) var/new_metadata = strip_html_simple(tgui_input_text(user, "Enter any information you'd like others to see relating to your LIKED roleplay preferences. This will not be saved permanently unless you click save in the Character Setup panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(pref.metadata_likes), multiline = TRUE, prevent_enter = TRUE)) //ChompEDIT - usr removal
if(new_metadata && CanUseTopic(user)) if(new_metadata && CanUseTopic(user))
if(new_metadata == "!clear") if(new_metadata == "!clear")
new_metadata = "" new_metadata = ""
pref.metadata_likes = new_metadata pref.metadata_likes = new_metadata
else if(href_list["edit_ooc_note_dislikes"]) else if(href_list["edit_ooc_note_dislikes"])
var/new_metadata = strip_html_simple(tgui_input_text(usr, "Enter any information you'd like others to see relating to your DISLIKED roleplay preferences. This will not be saved permanently unless you click save in the Character Setup panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(pref.metadata_dislikes), multiline = TRUE, prevent_enter = TRUE)) var/new_metadata = strip_html_simple(tgui_input_text(user, "Enter any information you'd like others to see relating to your DISLIKED roleplay preferences. This will not be saved permanently unless you click save in the Character Setup panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(pref.metadata_dislikes), multiline = TRUE, prevent_enter = TRUE)) //ChompEDIT - usr removal
if(new_metadata && CanUseTopic(user)) if(new_metadata && CanUseTopic(user))
if(new_metadata == "!clear") if(new_metadata == "!clear")
new_metadata = "" new_metadata = ""
pref.metadata_dislikes = new_metadata pref.metadata_dislikes = new_metadata
//CHOMPEdit Start //CHOMPEdit Start
else if(href_list["edit_ooc_note_favs"]) else if(href_list["edit_ooc_note_favs"])
var/new_metadata = strip_html_simple(tgui_input_text(usr, "Enter any information you'd like others to see relating to your FAVOURITE roleplay preferences. This will not be saved permanently unless you click save in the Character Setup panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(pref.metadata_favs), multiline = TRUE, prevent_enter = TRUE)) var/new_metadata = strip_html_simple(tgui_input_text(user, "Enter any information you'd like others to see relating to your FAVOURITE roleplay preferences. This will not be saved permanently unless you click save in the Character Setup panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(pref.metadata_favs), multiline = TRUE, prevent_enter = TRUE)) //ChompEDIT - usr removal
if(new_metadata && CanUseTopic(user)) if(new_metadata && CanUseTopic(user))
if(new_metadata == "!clear") if(new_metadata == "!clear")
new_metadata = "" new_metadata = ""
pref.metadata_favs = new_metadata pref.metadata_favs = new_metadata
else if(href_list["edit_ooc_note_maybes"]) else if(href_list["edit_ooc_note_maybes"])
var/new_metadata = strip_html_simple(tgui_input_text(usr, "Enter any information you'd like others to see relating to your MAYBE roleplay preferences. This will not be saved permanently unless you click save in the Character Setup panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(pref.metadata_maybes), multiline = TRUE, prevent_enter = TRUE)) var/new_metadata = strip_html_simple(tgui_input_text(user, "Enter any information you'd like others to see relating to your MAYBE roleplay preferences. This will not be saved permanently unless you click save in the Character Setup panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(pref.metadata_maybes), multiline = TRUE, prevent_enter = TRUE)) //ChompEDIT - usr removal
if(new_metadata && CanUseTopic(user)) if(new_metadata && CanUseTopic(user))
if(new_metadata == "!clear") if(new_metadata == "!clear")
new_metadata = "" new_metadata = ""

4
code/modules/client/preference_setup/general/02_language.dm
View File

@@ -120,7 +120,7 @@
if(new_lang && pref.alternate_languages.len < (S.num_alternate_languages + pref.extra_languages)) if(new_lang && pref.alternate_languages.len < (S.num_alternate_languages + pref.extra_languages))
var/datum/language/chosen_lang = GLOB.all_languages[new_lang] var/datum/language/chosen_lang = GLOB.all_languages[new_lang]
if(istype(chosen_lang)) if(istype(chosen_lang))
var/choice = tgui_alert(usr, "[chosen_lang.desc]",chosen_lang.name, list("Take","Cancel")) var/choice = tgui_alert(user, "[chosen_lang.desc]",chosen_lang.name, list("Take","Cancel")) //ChompEDIT - usr removal
if(choice != "Cancel" && pref.alternate_languages.len < (S.num_alternate_languages + pref.extra_languages)) if(choice != "Cancel" && pref.alternate_languages.len < (S.num_alternate_languages + pref.extra_languages))
pref.alternate_languages |= new_lang pref.alternate_languages |= new_lang
return TOPIC_REFRESH return TOPIC_REFRESH
@@ -129,7 +129,7 @@
var/char var/char
var/keys[0] var/keys[0]
do do
char = tgui_input_text(usr, "Enter a single special character.\nYou may re-select the same characters.\nThe following characters are already in use by radio: ; : .\nThe following characters are already in use by special say commands: ! * ^", "Enter Character - [3 - keys.len] remaining") char = tgui_input_text(user, "Enter a single special character.\nYou may re-select the same characters.\nThe following characters are already in use by radio: ; : .\nThe following characters are already in use by special say commands: ! * ^", "Enter Character - [3 - keys.len] remaining") //ChompEDIT - usr removal
if(char) if(char)
if(length(char) > 1) if(length(char) > 1)
tgui_alert_async(user, "Only single characters allowed.", "Error") tgui_alert_async(user, "Only single characters allowed.", "Error")

22
code/modules/client/preference_setup/general/03_body.dm
View File

@@ -698,7 +698,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/desc_id = href_list["change_descriptor"] var/desc_id = href_list["change_descriptor"]
if(pref.body_descriptors[desc_id]) if(pref.body_descriptors[desc_id])
var/datum/mob_descriptor/descriptor = mob_species.descriptors[desc_id] var/datum/mob_descriptor/descriptor = mob_species.descriptors[desc_id]
var/choice = tgui_input_list(usr, "Please select a descriptor.", "Descriptor", descriptor.chargen_value_descriptors) var/choice = tgui_input_list(user, "Please select a descriptor.", "Descriptor", descriptor.chargen_value_descriptors) //ChompEDIT - usr removal
if(choice && mob_species.descriptors[desc_id]) // Check in case they sneakily changed species. if(choice && mob_species.descriptors[desc_id]) // Check in case they sneakily changed species.
pref.body_descriptors[desc_id] = descriptor.chargen_value_descriptors[choice] pref.body_descriptors[desc_id] = descriptor.chargen_value_descriptors[choice]
return TOPIC_REFRESH return TOPIC_REFRESH
@@ -711,7 +711,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else if(href_list["show_species"]) else if(href_list["show_species"])
// Actual whitelist checks are handled elsewhere, this is just for accessing the preview window. // Actual whitelist checks are handled elsewhere, this is just for accessing the preview window.
var/choice = tgui_input_list(usr, "Which species would you like to look at?", "Species Choice", GLOB.playable_species) var/choice = tgui_input_list(user, "Which species would you like to look at?", "Species Choice", GLOB.playable_species) //ChompEDIT - usr removal
if(!choice) return if(!choice) return
pref.species_preview = choice pref.species_preview = choice
SetSpecies(preference_mob()) SetSpecies(preference_mob())
@@ -719,7 +719,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
return TOPIC_HANDLED return TOPIC_HANDLED
else if(href_list["disabilities_yw"]) else if(href_list["disabilities_yw"])
Disabilities_YW(usr) Disabilities_YW(user) //ChompEDIT - usr removal
else if(href_list["set_species"]) else if(href_list["set_species"])
user << browse(null, "window=species") user << browse(null, "window=species")
@@ -1236,7 +1236,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else if(href_list["disabilities"]) else if(href_list["disabilities"])
var/disability_flag = text2num(href_list["disabilities"]) var/disability_flag = text2num(href_list["disabilities"])
pref.disabilities ^= disability_flag pref.disabilities ^= disability_flag
Disabilities_YW(usr) //YW Edit Disabilities_YW(user) //YW Edit //ChompEDIT - usr removal
else if(href_list["toggle_preview_value"]) else if(href_list["toggle_preview_value"])
pref.equip_preview_mob ^= text2num(href_list["toggle_preview_value"]) pref.equip_preview_mob ^= text2num(href_list["toggle_preview_value"])
@@ -1270,23 +1270,23 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else if(href_list["wingdings"]) else if(href_list["wingdings"])
pref.wingdings = !pref.wingdings pref.wingdings = !pref.wingdings
Disabilities_YW(usr) Disabilities_YW(user) //ChompEDIT - usr removal
else if(href_list["colorblind_mono"]) else if(href_list["colorblind_mono"])
pref.colorblind_mono = !pref.colorblind_mono pref.colorblind_mono = !pref.colorblind_mono
Disabilities_YW(usr) Disabilities_YW(user) //ChompEDIT - usr removal
else if(href_list["colorblind_vulp"]) else if(href_list["colorblind_vulp"])
pref.colorblind_vulp = !pref.colorblind_vulp pref.colorblind_vulp = !pref.colorblind_vulp
Disabilities_YW(usr) Disabilities_YW(user) //ChompEDIT - usr removal
else if(href_list["colorblind_taj"]) else if(href_list["colorblind_taj"])
pref.colorblind_taj = !pref.colorblind_taj pref.colorblind_taj = !pref.colorblind_taj
Disabilities_YW(usr) Disabilities_YW(user) //ChompEDIT - usr removal
else if(href_list["haemophilia"]) else if(href_list["haemophilia"])
pref.haemophilia = !pref.haemophilia pref.haemophilia = !pref.haemophilia
Disabilities_YW(usr) Disabilities_YW(user) //ChompEDIT - usr removal
else if(href_list["reset_disabilities"]) else if(href_list["reset_disabilities"])
pref.wingdings = 0 pref.wingdings = 0
@@ -1294,7 +1294,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.colorblind_taj = 0 pref.colorblind_taj = 0
pref.colorblind_vulp = 0 pref.colorblind_vulp = 0
pref.haemophilia = 0 pref.haemophilia = 0
Disabilities_YW(usr) Disabilities_YW(user) //ChompEDIT - usr removal
//YW Add End //YW Add End
@@ -1433,7 +1433,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
//vorestation edit end //vorestation edit end
dat += "<td width = 200 align='center'>" dat += "<td width = 200 align='center'>"
if("preview" in cached_icon_states(current_species.icobase)) if("preview" in cached_icon_states(current_species.icobase))
usr << browse_rsc(icon(current_species.icobase,"preview"), "species_preview_[current_species.name].png") user << browse_rsc(icon(current_species.icobase,"preview"), "species_preview_[current_species.name].png") //ChompEDIT usr -> user
dat += "<img src='species_preview_[current_species.name].png' width='64px' height='64px'><br/><br/>" dat += "<img src='species_preview_[current_species.name].png' width='64px' height='64px'><br/><br/>"
dat += "<b>Language:</b> [current_species.species_language]<br/>" dat += "<b>Language:</b> [current_species.species_language]<br/>"
dat += "<small>" dat += "<small>"

2
code/modules/client/preference_setup/general/04_equipment.dm
View File

@@ -170,7 +170,7 @@ var/global/list/valid_ringtones = list(
var/datum/gear_tweak/gt = locate(href_list["tweak"]) var/datum/gear_tweak/gt = locate(href_list["tweak"])
if(!gt) if(!gt)
return TOPIC_NOACTION return TOPIC_NOACTION
var/new_metadata = gt.get_metadata(usr, get_metadata(underwear, gt)) var/new_metadata = gt.get_metadata(user, get_metadata(underwear, gt)) //ChompEDIT - usr removal
if(new_metadata) if(new_metadata)
set_metadata(underwear, gt, new_metadata) set_metadata(underwear, gt, new_metadata)
return TOPIC_REFRESH_UPDATE_PREVIEW return TOPIC_REFRESH_UPDATE_PREVIEW

6
code/modules/client/preference_setup/general/05_background.dm
View File

@@ -153,19 +153,19 @@
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["reset_medrecord"]) else if(href_list["reset_medrecord"])
var/resetmed_choice = tgui_alert(usr, "Wipe your Medical Records? This cannot be reverted if you have not saved your character recently! You may wish to make a backup first.","Reset Records",list("Yes","No")) var/resetmed_choice = tgui_alert(user, "Wipe your Medical Records? This cannot be reverted if you have not saved your character recently! You may wish to make a backup first.","Reset Records",list("Yes","No")) //ChompEDIT - usr removal
if(resetmed_choice == "Yes") if(resetmed_choice == "Yes")
pref.med_record = null pref.med_record = null
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["reset_emprecord"]) else if(href_list["reset_emprecord"])
var/resetemp_choice = tgui_alert(usr, "Wipe your Employment Records? This cannot be reverted if you have not saved your character recently! You may wish to make a backup first.","Reset Records",list("Yes","No")) var/resetemp_choice = tgui_alert(user, "Wipe your Employment Records? This cannot be reverted if you have not saved your character recently! You may wish to make a backup first.","Reset Records",list("Yes","No")) //ChompEDIT - usr removal
if(resetemp_choice == "Yes") if(resetemp_choice == "Yes")
pref.gen_record = null pref.gen_record = null
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["reset_secrecord"]) else if(href_list["reset_secrecord"])
var/resetsec_choice = tgui_alert(usr, "Wipe your Security Records? This cannot be reverted if you have not saved your character recently! You may wish to make a backup first.","Reset Records",list("Yes","No")) var/resetsec_choice = tgui_alert(user, "Wipe your Security Records? This cannot be reverted if you have not saved your character recently! You may wish to make a backup first.","Reset Records",list("Yes","No")) //ChompEDIT - usr removal
if(resetsec_choice == "Yes") if(resetsec_choice == "Yes")
pref.sec_record = null pref.sec_record = null
return TOPIC_REFRESH return TOPIC_REFRESH

16
code/modules/client/preference_setup/general/06_flavor.dm
View File

@@ -69,11 +69,11 @@
switch(href_list["flavor_text"]) switch(href_list["flavor_text"])
if("open") if("open")
if("general") if("general")
var/msg = strip_html_simple(tgui_input_text(usr,"Give a general description of your character. This will be shown regardless of clothings. Put in a single space to make blank.","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]]), multiline = TRUE, prevent_enter = TRUE)) //VOREStation Edit: separating out OOC notes var/msg = strip_html_simple(tgui_input_text(user,"Give a general description of your character. This will be shown regardless of clothings. Put in a single space to make blank.","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]]), multiline = TRUE, prevent_enter = TRUE)) //VOREStation Edit: separating out OOC notes //ChompEDIT - usr removal
if(CanUseTopic(user) && msg) if(CanUseTopic(user) && msg)
pref.flavor_texts[href_list["flavor_text"]] = msg pref.flavor_texts[href_list["flavor_text"]] = msg
else else
var/msg = strip_html_simple(tgui_input_text(usr,"Set the flavor text for your [href_list["flavor_text"]]. Put in a single space to make blank.","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]]), multiline = TRUE, prevent_enter = TRUE)) var/msg = strip_html_simple(tgui_input_text(user,"Set the flavor text for your [href_list["flavor_text"]]. Put in a single space to make blank.","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]]), multiline = TRUE, prevent_enter = TRUE)) //ChompEDIT - usr removal
if(CanUseTopic(user) && msg) if(CanUseTopic(user) && msg)
pref.flavor_texts[href_list["flavor_text"]] = msg pref.flavor_texts[href_list["flavor_text"]] = msg
SetFlavorText(user) SetFlavorText(user)
@@ -83,23 +83,23 @@
switch(href_list["flavour_text_robot"]) switch(href_list["flavour_text_robot"])
if("open") if("open")
if("Default") if("Default")
var/msg = strip_html_simple(tgui_input_text(usr,"Set the default flavour text for your robot. It will be used for any module without individual setting. Put in a single space to make blank.","Flavour Text",html_decode(pref.flavour_texts_robot["Default"]), multiline = TRUE, prevent_enter = TRUE)) var/msg = strip_html_simple(tgui_input_text(user,"Set the default flavour text for your robot. It will be used for any module without individual setting. Put in a single space to make blank.","Flavour Text",html_decode(pref.flavour_texts_robot["Default"]), multiline = TRUE, prevent_enter = TRUE)) //ChompEDIT - usr removal
if(CanUseTopic(user) && msg) if(CanUseTopic(user) && msg)
pref.flavour_texts_robot[href_list["flavour_text_robot"]] = msg pref.flavour_texts_robot[href_list["flavour_text_robot"]] = msg
else else
var/msg = strip_html_simple(tgui_input_text(usr,"Set the flavour text for your robot with [href_list["flavour_text_robot"]] module. If you leave this blank, default flavour text will be used for this module. Put in a single space to make blank.","Flavour Text",html_decode(pref.flavour_texts_robot[href_list["flavour_text_robot"]]), multiline = TRUE, prevent_enter = TRUE)) var/msg = strip_html_simple(tgui_input_text(user,"Set the flavour text for your robot with [href_list["flavour_text_robot"]] module. If you leave this blank, default flavour text will be used for this module. Put in a single space to make blank.","Flavour Text",html_decode(pref.flavour_texts_robot[href_list["flavour_text_robot"]]), multiline = TRUE, prevent_enter = TRUE)) //ChompEDIT - usr removal
if(CanUseTopic(user) && msg) if(CanUseTopic(user) && msg)
pref.flavour_texts_robot[href_list["flavour_text_robot"]] = msg pref.flavour_texts_robot[href_list["flavour_text_robot"]] = msg
SetFlavourTextRobot(user) SetFlavourTextRobot(user)
return TOPIC_HANDLED return TOPIC_HANDLED
else if(href_list["custom_link"]) else if(href_list["custom_link"])
var/new_link = strip_html_simple(tgui_input_text(usr, "Enter a link to add on to your examine text! This should be a related image link/gallery, or things like your F-list. This is not the place for memes.", "Custom Link" , html_decode(pref.custom_link), max_length = 100, encode = TRUE, prevent_enter = TRUE)) var/new_link = strip_html_simple(tgui_input_text(user, "Enter a link to add on to your examine text! This should be a related image link/gallery, or things like your F-list. This is not the place for memes.", "Custom Link" , html_decode(pref.custom_link), max_length = 100, encode = TRUE, prevent_enter = TRUE)) //ChompEDIT - usr removal
if(new_link && CanUseTopic(usr)) if(new_link && CanUseTopic(user)) //ChompEDIT - usr removal
if(length(new_link) > 100) if(length(new_link) > 100)
to_chat(usr, "<span class = 'warning'>Your entry is too long, it must be 100 characters or less.</span>") to_chat(user, "<span class = 'warning'>Your entry is too long, it must be 100 characters or less.</span>") //ChompEDIT - usr removal
return return
pref.custom_link = new_link pref.custom_link = new_link
log_admin("[usr]/[usr.ckey] set their custom link to [pref.custom_link]") log_admin("[user]/[user.ckey] set their custom link to [pref.custom_link]") //ChompEDIT - usr removal
return ..() return ..()

2
code/modules/client/preference_setup/occupation/occupation.dm
View File

@@ -255,7 +255,7 @@
var/datum/job/job = locate(href_list["select_alt_title"]) var/datum/job/job = locate(href_list["select_alt_title"])
if (job) if (job)
var/choices = list(job.title) + job.alt_titles var/choices = list(job.title) + job.alt_titles
var/choice = tgui_input_list(usr, "Choose a title for [job.title].", "Choose Title", choices, pref.GetPlayerAltTitle(job)) var/choice = tgui_input_list(user, "Choose a title for [job.title].", "Choose Title", choices, pref.GetPlayerAltTitle(job)) //ChompEDIT - usr removal
if(choice && CanUseTopic(user)) if(choice && CanUseTopic(user))
SetPlayerAltTitle(job, choice) SetPlayerAltTitle(job, choice)
return (pref.equip_preview_mob ? TOPIC_REFRESH_UPDATE_PREVIEW : TOPIC_REFRESH) return (pref.equip_preview_mob ? TOPIC_REFRESH_UPDATE_PREVIEW : TOPIC_REFRESH)

4
code/modules/client/preference_setup/volume_sliders/01_volume.dm
View File

@@ -40,7 +40,7 @@
var/channel = href_list["change_volume"] var/channel = href_list["change_volume"]
if(!(channel in pref.volume_channels)) if(!(channel in pref.volume_channels))
pref.volume_channels["[channel]"] = 1 pref.volume_channels["[channel]"] = 1
var/value = tgui_input_number(usr, "Choose your volume for [channel] (0-200%)", "[channel] volume", (pref.volume_channels[channel] * 100), 200, 0) var/value = tgui_input_number(user, "Choose your volume for [channel] (0-200%)", "[channel] volume", (pref.volume_channels[channel] * 100), 200, 0) //ChompEDIT - usr removal
if(isnum(value)) if(isnum(value))
value = CLAMP(value, 0, 200) value = CLAMP(value, 0, 200)
pref.volume_channels["[channel]"] = (value / 100) pref.volume_channels["[channel]"] = (value / 100)
@@ -74,7 +74,7 @@
/datum/volume_panel/tgui_data(mob/user) /datum/volume_panel/tgui_data(mob/user)
if(!user.client || !user.client.prefs) if(!user.client || !user.client.prefs)
return list("error" = TRUE) return list("error" = TRUE)
var/list/data = ..() var/list/data = ..()
data["volume_channels"] = user.client.prefs.volume_channels data["volume_channels"] = user.client.prefs.volume_channels
return data return data

2
code/modules/client/preference_setup/volume_sliders/02_media.dm
View File

@@ -33,7 +33,7 @@
/datum/category_item/player_setup_item/volume_sliders/media/OnTopic(var/href, var/list/href_list, var/mob/user) /datum/category_item/player_setup_item/volume_sliders/media/OnTopic(var/href, var/list/href_list, var/mob/user)
if(href_list["change_media_volume"]) if(href_list["change_media_volume"])
if(CanUseTopic(user)) if(CanUseTopic(user))
var/value = tgui_input_number(usr, "Choose your Jukebox volume (0-100%)", "Jukebox volume", round(pref.media_volume * 100), 100, 0) var/value = tgui_input_number(user, "Choose your Jukebox volume (0-100%)", "Jukebox volume", round(pref.media_volume * 100), 100, 0) //ChompEDIT - usr removal
if(isnum(value)) if(isnum(value))
value = CLAMP(value, 0, 100) value = CLAMP(value, 0, 100)
pref.media_volume = value/100.0 pref.media_volume = value/100.0

8
code/modules/client/preference_setup/vore/02_size.dm
View File

@@ -198,7 +198,7 @@
else if(href_list["voice_freq"]) else if(href_list["voice_freq"])
var/list/preset_voice_freqs = list("high" = MAX_VOICE_FREQ, "middle-high" = 56250, "middle" = 42500, "middle-low"= 28750, "low" = MIN_VOICE_FREQ, "custom" = 1, "random" = 0) var/list/preset_voice_freqs = list("high" = MAX_VOICE_FREQ, "middle-high" = 56250, "middle" = 42500, "middle-low"= 28750, "low" = MIN_VOICE_FREQ, "custom" = 1, "random" = 0)
var/choice = tgui_input_list(usr, "What would you like to set your voice frequency to? ([MIN_VOICE_FREQ] - [MAX_VOICE_FREQ])", "Voice Frequency", preset_voice_freqs) var/choice = tgui_input_list(user, "What would you like to set your voice frequency to? ([MIN_VOICE_FREQ] - [MAX_VOICE_FREQ])", "Voice Frequency", preset_voice_freqs) //ChompEDIT - usr removal
if(!choice) if(!choice)
return return
choice = preset_voice_freqs[choice] choice = preset_voice_freqs[choice]
@@ -231,7 +231,7 @@
"goon speak roach", "goon speak roach",
"goon speak skelly", "goon speak skelly",
"xeno speak") // CHOMPedit "xeno speak") // CHOMPedit
var/choice = tgui_input_list(usr, "Which set of sounds would you like to use for your character's speech sounds?", "Voice Sounds", possible_voice_types) var/choice = tgui_input_list(user, "Which set of sounds would you like to use for your character's speech sounds?", "Voice Sounds", possible_voice_types)
if(!pref.voice_sound) if(!pref.voice_sound)
pref.voice_sound = "goon speak 1" //CHOMPEdit - Defaults voice to a less jarring sound pref.voice_sound = "goon speak 1" //CHOMPEdit - Defaults voice to a less jarring sound
else if(!choice) else if(!choice)
@@ -240,7 +240,7 @@
pref.voice_sound = choice pref.voice_sound = choice
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["customize_speech_bubble"]) else if(href_list["customize_speech_bubble"])
var/choice = tgui_input_list(usr, "What speech bubble style do you want to use? (default for automatic selection)", "Custom Speech Bubble", selectable_speech_bubbles) var/choice = tgui_input_list(user, "What speech bubble style do you want to use? (default for automatic selection)", "Custom Speech Bubble", selectable_speech_bubbles)
if(!choice) if(!choice)
pref.custom_speech_bubble = "default" pref.custom_speech_bubble = "default"
else else
@@ -289,7 +289,7 @@
// CHOMPEdit Start: Pain/Scream/Death sounds // CHOMPEdit Start: Pain/Scream/Death sounds
else if(href_list["species_sound_options"]) // You shouldn't be able to see this option if you don't have the option to select a custom icon base, so we don't need to re-check for safety here. else if(href_list["species_sound_options"]) // You shouldn't be able to see this option if you don't have the option to select a custom icon base, so we don't need to re-check for safety here.
var/list/possible_species_sound_types = species_sound_map var/list/possible_species_sound_types = species_sound_map
var/choice = tgui_input_list(usr, "Which set of sounds would you like to use for your character's species sounds? (Cough, Sneeze, Scream, Pain, Gasp, Death)", "Species Sounds", possible_species_sound_types) var/choice = tgui_input_list(user, "Which set of sounds would you like to use for your character's species sounds? (Cough, Sneeze, Scream, Pain, Gasp, Death)", "Species Sounds", possible_species_sound_types)
if(!choice) if(!choice)
return TOPIC_REFRESH // No choice? Don't reset our selection return TOPIC_REFRESH // No choice? Don't reset our selection
else else

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

@@ -376,19 +376,19 @@ var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","s
else if(href_list["custom_base"]) else if(href_list["custom_base"])
var/list/choices = pref.get_custom_bases_for_species() var/list/choices = pref.get_custom_bases_for_species()
var/text_choice = tgui_input_list(usr, "Pick an icon set for your species:","Icon Base", choices) var/text_choice = tgui_input_list(user, "Pick an icon set for your species:","Icon Base", choices) //ChompEDIT - usr removal
if(text_choice in choices) if(text_choice in choices)
pref.custom_base = text_choice pref.custom_base = text_choice
return TOPIC_REFRESH_UPDATE_PREVIEW return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["blood_color"]) else if(href_list["blood_color"])
var/color_choice = input(usr, "Pick a blood color (does not apply to synths)","Blood Color",pref.blood_color) as color var/color_choice = input(user, "Pick a blood color (does not apply to synths)","Blood Color",pref.blood_color) as color //ChompEDIT - usr removal
if(color_choice) if(color_choice)
pref.blood_color = sanitize_hexcolor(color_choice, default="#A10808") pref.blood_color = sanitize_hexcolor(color_choice, default="#A10808")
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["blood_reset"]) else if(href_list["blood_reset"])
var/choice = tgui_alert(usr, "Reset blood color to human default (#A10808)?","Reset Blood Color",list("Reset","Cancel")) var/choice = tgui_alert(user, "Reset blood color to human default (#A10808)?","Reset Blood Color",list("Reset","Cancel")) //ChompEDIT - usr removal
if(choice == "Reset") if(choice == "Reset")
pref.blood_color = "#A10808" pref.blood_color = "#A10808"
return TOPIC_REFRESH return TOPIC_REFRESH
@@ -401,7 +401,7 @@ var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","s
else if(href_list["clicked_pos_trait"]) else if(href_list["clicked_pos_trait"])
var/datum/trait/trait = text2path(href_list["clicked_pos_trait"]) var/datum/trait/trait = text2path(href_list["clicked_pos_trait"])
var/choice = tgui_alert(usr, "Remove [initial(trait.name)] and regain [initial(trait.cost)] points?","Remove Trait",list("Remove","Cancel")) var/choice = tgui_alert(user, "Remove [initial(trait.name)] and regain [initial(trait.cost)] points?","Remove Trait",list("Remove","Cancel")) //ChompEDIT - usr removal
if(choice == "Remove") if(choice == "Remove")
pref.pos_traits -= trait pref.pos_traits -= trait
var/datum/trait/instance = all_traits[trait] var/datum/trait/instance = all_traits[trait]
@@ -410,7 +410,7 @@ var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","s
else if(href_list["clicked_neu_trait"]) else if(href_list["clicked_neu_trait"])
var/datum/trait/trait = text2path(href_list["clicked_neu_trait"]) var/datum/trait/trait = text2path(href_list["clicked_neu_trait"])
var/choice = tgui_alert(usr, "Remove [initial(trait.name)]?","Remove Trait",list("Remove","Cancel")) var/choice = tgui_alert(user, "Remove [initial(trait.name)]?","Remove Trait",list("Remove","Cancel")) //ChompEDIT - usr removal
if(choice == "Remove") if(choice == "Remove")
pref.neu_traits -= trait pref.neu_traits -= trait
var/datum/trait/instance = all_traits[trait] var/datum/trait/instance = all_traits[trait]
@@ -419,7 +419,7 @@ var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","s
else if(href_list["clicked_neg_trait"]) else if(href_list["clicked_neg_trait"])
var/datum/trait/trait = text2path(href_list["clicked_neg_trait"]) var/datum/trait/trait = text2path(href_list["clicked_neg_trait"])
var/choice = tgui_alert(usr, "Remove [initial(trait.name)] and lose [initial(trait.cost)] points?","Remove Trait",list("Remove","Cancel")) var/choice = tgui_alert(user, "Remove [initial(trait.name)] and lose [initial(trait.cost)] points?","Remove Trait",list("Remove","Cancel")) //ChompEDIT - usr removal
if(choice == "Remove") if(choice == "Remove")
pref.neg_traits -= trait pref.neg_traits -= trait
var/datum/trait/instance = all_traits[trait] var/datum/trait/instance = all_traits[trait]
@@ -432,25 +432,25 @@ var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","s
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["custom_say"]) else if(href_list["custom_say"])
var/say_choice = sanitize(tgui_input_text(usr, "This word or phrase will appear instead of 'says': [pref.real_name] says, \"Hi.\"", "Custom Say", pref.custom_say, 12), 12) var/say_choice = sanitize(tgui_input_text(user, "This word or phrase will appear instead of 'says': [pref.real_name] says, \"Hi.\"", "Custom Say", pref.custom_say, 12), 12) //ChompEDIT - usr removal
if(say_choice) if(say_choice)
pref.custom_say = say_choice pref.custom_say = say_choice
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["custom_whisper"]) else if(href_list["custom_whisper"])
var/whisper_choice = sanitize(tgui_input_text(usr, "This word or phrase will appear instead of 'whispers': [pref.real_name] whispers, \"Hi...\"", "Custom Whisper", pref.custom_whisper, 12), 12) var/whisper_choice = sanitize(tgui_input_text(user, "This word or phrase will appear instead of 'whispers': [pref.real_name] whispers, \"Hi...\"", "Custom Whisper", pref.custom_whisper, 12), 12) //ChompEDIT - usr removal
if(whisper_choice) if(whisper_choice)
pref.custom_whisper = whisper_choice pref.custom_whisper = whisper_choice
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["custom_ask"]) else if(href_list["custom_ask"])
var/ask_choice = sanitize(tgui_input_text(usr, "This word or phrase will appear instead of 'asks': [pref.real_name] asks, \"Hi?\"", "Custom Ask", pref.custom_ask, 12), 12) var/ask_choice = sanitize(tgui_input_text(user, "This word or phrase will appear instead of 'asks': [pref.real_name] asks, \"Hi?\"", "Custom Ask", pref.custom_ask, 12), 12) //ChompEDIT - usr removal
if(ask_choice) if(ask_choice)
pref.custom_ask = ask_choice pref.custom_ask = ask_choice
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["custom_exclaim"]) else if(href_list["custom_exclaim"])
var/exclaim_choice = sanitize(tgui_input_text(usr, "This word or phrase will appear instead of 'exclaims', 'shouts' or 'yells': [pref.real_name] exclaims, \"Hi!\"", "Custom Exclaim", pref.custom_exclaim, 12), 12) var/exclaim_choice = sanitize(tgui_input_text(user, "This word or phrase will appear instead of 'exclaims', 'shouts' or 'yells': [pref.real_name] exclaims, \"Hi!\"", "Custom Exclaim", pref.custom_exclaim, 12), 12) //ChompEDIT - usr removal
if(exclaim_choice) if(exclaim_choice)
pref.custom_exclaim = exclaim_choice pref.custom_exclaim = exclaim_choice
return TOPIC_REFRESH return TOPIC_REFRESH
@@ -458,7 +458,7 @@ var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","s
else if(href_list["custom_heat"]) else if(href_list["custom_heat"])
tgui_alert(user, "You are setting custom heat messages. These will overwrite your species' defaults. To return to defaults, click reset.") tgui_alert(user, "You are setting custom heat messages. These will overwrite your species' defaults. To return to defaults, click reset.")
var/old_message = pref.custom_heat.Join("\n\n") var/old_message = pref.custom_heat.Join("\n\n")
var/new_message = sanitize(tgui_input_text(usr,"Use double enter between messages to enter a new one. Must be at least 3 characters long, 160 characters max and up to 10 messages are allowed.","Heat Discomfort messages",old_message, multiline= TRUE, prevent_enter = TRUE), MAX_MESSAGE_LEN,0,0,0) var/new_message = sanitize(tgui_input_text(user,"Use double enter between messages to enter a new one. Must be at least 3 characters long, 160 characters max and up to 10 messages are allowed.","Heat Discomfort messages",old_message, multiline= TRUE, prevent_enter = TRUE), MAX_MESSAGE_LEN,0,0,0) //ChompEDIT - usr removal
if(length(new_message) > 0) if(length(new_message) > 0)
var/list/raw_list = splittext(new_message,"\n\n") var/list/raw_list = splittext(new_message,"\n\n")
if(raw_list.len > 10) if(raw_list.len > 10)
@@ -475,7 +475,7 @@ var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","s
else if(href_list["custom_cold"]) else if(href_list["custom_cold"])
tgui_alert(user, "You are setting custom cold messages. These will overwrite your species' defaults. To return to defaults, click reset.") tgui_alert(user, "You are setting custom cold messages. These will overwrite your species' defaults. To return to defaults, click reset.")
var/old_message = pref.custom_cold.Join("\n\n") //CHOMP Edit var/old_message = pref.custom_cold.Join("\n\n") //CHOMP Edit
var/new_message = sanitize(tgui_input_text(usr,"Use double enter between messages to enter a new one. Must be at least 3 characters long, 160 characters max and up to 10 messages are allowed.","Cold Discomfort messages",old_message, multiline= TRUE, prevent_enter = TRUE), MAX_MESSAGE_LEN,0,0,0) var/new_message = sanitize(tgui_input_text(user,"Use double enter between messages to enter a new one. Must be at least 3 characters long, 160 characters max and up to 10 messages are allowed.","Cold Discomfort messages",old_message, multiline= TRUE, prevent_enter = TRUE), MAX_MESSAGE_LEN,0,0,0) //ChompEDIT - usr removal
if(length(new_message) > 0) if(length(new_message) > 0)
var/list/raw_list = splittext(new_message,"\n\n") var/list/raw_list = splittext(new_message,"\n\n")
if(raw_list.len > 10) if(raw_list.len > 10)
@@ -490,37 +490,37 @@ var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","s
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["reset_say"]) else if(href_list["reset_say"])
var/say_choice = tgui_alert(usr, "Reset your Custom Say Verb?","Reset Verb",list("Yes","No")) var/say_choice = tgui_alert(user, "Reset your Custom Say Verb?","Reset Verb",list("Yes","No")) //ChompEDIT - usr removal
if(say_choice == "Yes") if(say_choice == "Yes")
pref.custom_say = null pref.custom_say = null
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["reset_whisper"]) else if(href_list["reset_whisper"])
var/whisper_choice = tgui_alert(usr, "Reset your Custom Whisper Verb?","Reset Verb",list("Yes","No")) var/whisper_choice = tgui_alert(user, "Reset your Custom Whisper Verb?","Reset Verb",list("Yes","No")) //ChompEDIT - usr removal
if(whisper_choice == "Yes") if(whisper_choice == "Yes")
pref.custom_whisper = null pref.custom_whisper = null
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["reset_ask"]) else if(href_list["reset_ask"])
var/ask_choice = tgui_alert(usr, "Reset your Custom Ask Verb?","Reset Verb",list("Yes","No")) var/ask_choice = tgui_alert(user, "Reset your Custom Ask Verb?","Reset Verb",list("Yes","No")) //ChompEDIT - usr removal
if(ask_choice == "Yes") if(ask_choice == "Yes")
pref.custom_ask = null pref.custom_ask = null
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["reset_exclaim"]) else if(href_list["reset_exclaim"])
var/exclaim_choice = tgui_alert(usr, "Reset your Custom Exclaim Verb?","Reset Verb",list("Yes","No")) var/exclaim_choice = tgui_alert(user, "Reset your Custom Exclaim Verb?","Reset Verb",list("Yes","No")) //ChompEDIT - usr removal
if(exclaim_choice == "Yes") if(exclaim_choice == "Yes")
pref.custom_exclaim = null pref.custom_exclaim = null
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["reset_cold"]) else if(href_list["reset_cold"])
var/cold_choice = tgui_alert(usr, "Reset your Custom Cold Discomfort messages?", "Reset Discomfort",list("Yes","No")) var/cold_choice = tgui_alert(user, "Reset your Custom Cold Discomfort messages?", "Reset Discomfort",list("Yes","No")) //ChompEDIT - usr removal
if(cold_choice == "Yes") if(cold_choice == "Yes")
pref.custom_cold = list() pref.custom_cold = list()
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["reset_heat"]) else if(href_list["reset_heat"])
var/heat_choice = tgui_alert(usr, "Reset your Custom Heat Discomfort messages?", "Reset Discomfort",list("Yes","No")) var/heat_choice = tgui_alert(user, "Reset your Custom Heat Discomfort messages?", "Reset Discomfort",list("Yes","No")) //ChompEDIT - usr removal
if(heat_choice == "Yes") if(heat_choice == "Yes")
pref.custom_heat = list() pref.custom_heat = list()
return TOPIC_REFRESH return TOPIC_REFRESH
@@ -585,12 +585,12 @@ var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","s
var/trait_choice var/trait_choice
var/done = FALSE var/done = FALSE
while(!done) while(!done)
trait_choice = tgui_input_list(usr, message, title, nicelist) trait_choice = tgui_input_list(user, message, title, nicelist) //ChompEDIT - usr removal
if(!trait_choice) if(!trait_choice)
done = TRUE done = TRUE
if(trait_choice in nicelist) if(trait_choice in nicelist)
var/datum/trait/path = nicelist[trait_choice] var/datum/trait/path = nicelist[trait_choice]
var/choice = tgui_alert(usr, "\[Cost:[initial(path.cost)]\] [initial(path.desc)]",initial(path.name), list("Take Trait","Go Back")) var/choice = tgui_alert(user, "\[Cost:[initial(path.cost)]\] [initial(path.desc)]",initial(path.name), list("Take Trait","Go Back")) //ChompEDIT - usr removal
if(choice != "Go Back") if(choice != "Go Back")
done = TRUE done = TRUE
@@ -603,20 +603,20 @@ var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","s
var/conflict = FALSE var/conflict = FALSE
if(pref.dirty_synth && !(instance.can_take & SYNTHETICS)) if(pref.dirty_synth && !(instance.can_take & SYNTHETICS))
tgui_alert_async(usr, "The trait you've selected can only be taken by organic characters!", "Error") tgui_alert_async(user, "The trait you've selected can only be taken by organic characters!", "Error") //ChompEDIT - usr removal
//pref.dirty_synth = 0 //Just to be sure //CHOMPEdit this shit broke, stop. //pref.dirty_synth = 0 //Just to be sure //CHOMPEdit this shit broke, stop.
return TOPIC_REFRESH return TOPIC_REFRESH
if(pref.gross_meatbag && !(instance.can_take & ORGANICS)) if(pref.gross_meatbag && !(instance.can_take & ORGANICS))
tgui_alert_async(usr, "The trait you've selected can only be taken by synthetic characters!", "Error") tgui_alert_async(user, "The trait you've selected can only be taken by synthetic characters!", "Error") //ChompEDIT - usr removal
return TOPIC_REFRESH return TOPIC_REFRESH
if(pref.species in instance.banned_species) if(pref.species in instance.banned_species)
tgui_alert_async(usr, "The trait you've selected cannot be taken by the species you've chosen!", "Error") tgui_alert_async(user, "The trait you've selected cannot be taken by the species you've chosen!", "Error") //ChompEDIT - usr removal
return TOPIC_REFRESH return TOPIC_REFRESH
if( LAZYLEN(instance.allowed_species) && !(pref.species in instance.allowed_species)) if( LAZYLEN(instance.allowed_species) && !(pref.species in instance.allowed_species))
tgui_alert_async(usr, "The trait you've selected cannot be taken by the species you've chosen!", "Error") tgui_alert_async(user, "The trait you've selected cannot be taken by the species you've chosen!", "Error") //ChompEDIT - usr removal
return TOPIC_REFRESH return TOPIC_REFRESH
if(trait_choice in pref.pos_traits + pref.neu_traits + pref.neg_traits) if(trait_choice in pref.pos_traits + pref.neu_traits + pref.neg_traits)
@@ -640,7 +640,7 @@ var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","s
break varconflict break varconflict
if(conflict) if(conflict)
tgui_alert_async(usr, "You cannot take this trait and [conflict] at the same time. Please remove that trait, or pick another trait to add.", "Error") tgui_alert_async(user, "You cannot take this trait and [conflict] at the same time. Please remove that trait, or pick another trait to add.", "Error") //ChompEDIT - usr removal
return TOPIC_REFRESH return TOPIC_REFRESH
instance.apply_pref(pref) instance.apply_pref(pref)

2
code/modules/client/preferences.dm
View File

@@ -348,7 +348,7 @@ var/list/preferences_datums = list()
else else
to_chat(user, "<span class='danger'>The forum URL is not set in the server configuration.</span>") to_chat(user, "<span class='danger'>The forum URL is not set in the server configuration.</span>")
return return
ShowChoices(usr) ShowChoices(user) //ChompEDIT - usr removal
return 1 return 1
/datum/preferences/Topic(href, list/href_list) /datum/preferences/Topic(href, list/href_list)

2
code/modules/mob/living/living.dm
View File

@@ -711,7 +711,7 @@
return return
/mob/living/proc/Examine_OOC() /mob/living/verb/Examine_OOC() //ChompEDIT - proc --> verb
set name = "Examine Meta-Info (OOC)" set name = "Examine Meta-Info (OOC)"
set category = "OOC" set category = "OOC"
set src in view() set src in view()

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

@@ -36,63 +36,64 @@
to_chat(usr, "<span class='filter_notice'>OOC notes updated. Don't forget to save!</span>") to_chat(usr, "<span class='filter_notice'>OOC notes updated. Don't forget to save!</span>")
log_admin("[key_name(usr)] updated their OOC notes mid-round.") log_admin("[key_name(usr)] updated their OOC notes mid-round.")
ooc_notes_window(usr) ooc_notes_window(usr)
set_metainfo_likes(FALSE)
set_metainfo_dislikes(FALSE)
//CHOMPEdit Start //CHOMPEdit Start
set_metainfo_favs(FALSE) set_metainfo_likes(usr, FALSE)
set_metainfo_maybes(FALSE) set_metainfo_dislikes(usr, FALSE)
set_metainfo_ooc_style(FALSE) set_metainfo_favs(usr, FALSE)
set_metainfo_maybes(usr, FALSE)
set_metainfo_ooc_style(usr, FALSE)
//CHOMPEdit End //CHOMPEdit End
/mob/living/proc/set_metainfo_panel() //ChompEDIT START - Removal of usr
if(usr != src) /mob/living/proc/set_metainfo_panel(var/mob/user)
if(user != src)
return return
var/new_metadata = strip_html_simple(tgui_input_text(usr, "Enter any information you'd like others to see, such as Roleplay-preferences. This will not be saved permanently unless you click save in the OOC notes panel!", "Game Preference" , html_decode(ooc_notes), multiline = TRUE, prevent_enter = TRUE)) var/new_metadata = strip_html_simple(tgui_input_text(user, "Enter any information you'd like others to see, such as Roleplay-preferences. This will not be saved permanently unless you click save in the OOC notes panel!", "Game Preference" , html_decode(ooc_notes), multiline = TRUE, prevent_enter = TRUE))
if(new_metadata && CanUseTopic(usr)) if(new_metadata && CanUseTopic(user))
ooc_notes = new_metadata ooc_notes = new_metadata
client.prefs.metadata = new_metadata client.prefs.metadata = new_metadata
to_chat(usr, "<span class='filter_notice'>OOC notes updated. Don't forget to save!</span>") to_chat(user, "<span class='filter_notice'>OOC notes updated. Don't forget to save!</span>")
log_admin("[key_name(usr)] updated their OOC notes mid-round.") log_admin("[key_name(user)] updated their OOC notes mid-round.")
ooc_notes_window(usr) ooc_notes_window(user)
/mob/living/proc/set_metainfo_likes(var/reopen = TRUE) /mob/living/proc/set_metainfo_likes(var/mob/user, var/reopen = TRUE)
if(usr != src) if(user != src)
return return
var/new_metadata = strip_html_simple(tgui_input_text(usr, "Enter any information you'd like others to see relating to your LIKED roleplay preferences. This will not be saved permanently unless you click save in the OOC notes panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(ooc_notes_likes), multiline = TRUE, prevent_enter = TRUE)) var/new_metadata = strip_html_simple(tgui_input_text(user, "Enter any information you'd like others to see relating to your LIKED roleplay preferences. This will not be saved permanently unless you click save in the OOC notes panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(ooc_notes_likes), multiline = TRUE, prevent_enter = TRUE))
if(new_metadata && CanUseTopic(usr)) if(new_metadata && CanUseTopic(user))
if(new_metadata == "!clear") if(new_metadata == "!clear")
new_metadata = "" new_metadata = ""
ooc_notes_likes = new_metadata ooc_notes_likes = new_metadata
client.prefs.metadata_likes = new_metadata client.prefs.metadata_likes = new_metadata
to_chat(usr, "<span class='filter_notice'>OOC note likes have been updated. Don't forget to save!</span>") to_chat(user, "<span class='filter_notice'>OOC note likes have been updated. Don't forget to save!</span>")
log_admin("[key_name(usr)] updated their OOC note likes mid-round.") log_admin("[key_name(user)] updated their OOC note likes mid-round.")
if(reopen) if(reopen)
ooc_notes_window(usr) ooc_notes_window(user)
/mob/living/proc/set_metainfo_dislikes(var/reopen = TRUE) /mob/living/proc/set_metainfo_dislikes(var/mob/user, var/reopen = TRUE)
if(usr != src) if(user != src)
return return
var/new_metadata = strip_html_simple(tgui_input_text(usr, "Enter any information you'd like others to see relating to your DISLIKED roleplay preferences. This will not be saved permanently unless you click save in the OOC notes panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(ooc_notes_dislikes), multiline = TRUE, prevent_enter = TRUE)) var/new_metadata = strip_html_simple(tgui_input_text(user, "Enter any information you'd like others to see relating to your DISLIKED roleplay preferences. This will not be saved permanently unless you click save in the OOC notes panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(ooc_notes_dislikes), multiline = TRUE, prevent_enter = TRUE))
if(new_metadata && CanUseTopic(usr)) if(new_metadata && CanUseTopic(user))
if(new_metadata == "!clear") if(new_metadata == "!clear")
new_metadata = "" new_metadata = ""
ooc_notes_dislikes = new_metadata ooc_notes_dislikes = new_metadata
client.prefs.metadata_dislikes = new_metadata client.prefs.metadata_dislikes = new_metadata
to_chat(usr, "<span class='filter_notice'>OOC note dislikes have been updated. Don't forget to save!</span>") to_chat(user, "<span class='filter_notice'>OOC note dislikes have been updated. Don't forget to save!</span>")
log_admin("[key_name(usr)] updated their OOC note dislikes mid-round.") log_admin("[key_name(user)] updated their OOC note dislikes mid-round.")
if(reopen) if(reopen)
ooc_notes_window(usr) ooc_notes_window(user)
/mob/living/proc/save_ooc_panel() /mob/living/proc/save_ooc_panel(var/mob/user)
if(usr != src) if(user != src)
return return
if(client.prefs.real_name != real_name) if(client.prefs.real_name != real_name)
to_chat(usr, "<span class='danger'>Your selected character slot name is not the same as your character's name. Aborting save. Please select [real_name]'s character slot in character setup before saving.</span>") to_chat(user, "<span class='danger'>Your selected character slot name is not the same as your character's name. Aborting save. Please select [real_name]'s character slot in character setup before saving.</span>")
return return
if(client.prefs.save_character()) if(client.prefs.save_character())
to_chat(usr, "<span class='filter_notice'>Character preferences saved.</span>") to_chat(user, "<span class='filter_notice'>Character preferences saved.</span>")
/mob/living/proc/print_ooc_notes_to_chat() /mob/living/proc/print_ooc_notes_to_chat(var/mob/user)
if(!ooc_notes) if(!ooc_notes)
return return
var/msg = ooc_notes var/msg = ooc_notes
@@ -139,9 +140,9 @@
msg += "<br><br><b>[span_yellow("MAYBES")]</b><br>[ooc_notes_maybes]" msg += "<br><br><b>[span_yellow("MAYBES")]</b><br>[ooc_notes_maybes]"
if(ooc_notes_dislikes) if(ooc_notes_dislikes)
msg += "<br><br><b>[span_red("DISLIKES")]</b><br>[ooc_notes_dislikes]" msg += "<br><br><b>[span_red("DISLIKES")]</b><br>[ooc_notes_dislikes]"
to_chat(usr, "<span class='chatexport'><b>[src]'s Metainfo:</b><br>[msg]</span>") to_chat(user, "<span class='chatexport'><b>[src]'s Metainfo:</b><br>[msg]</span>")
//CHOMPEdit End //CHOMPEdit End
//ChompEDIT END - Removal of usr
/mob/living/verb/set_custom_link() /mob/living/verb/set_custom_link()
set name = "Set Custom Link" set name = "Set Custom Link"
set desc = "Set a custom link to show up with your examine text." set desc = "Set a custom link to show up with your examine text."

2
code/modules/mob/living/login.dm
View File

@@ -25,7 +25,7 @@
add_verb(src,/mob/living/proc/fix_vore_effects) //CHOMPEdit TGPanel //CHOMPedit add_verb(src,/mob/living/proc/fix_vore_effects) //CHOMPEdit TGPanel //CHOMPedit
if(!no_vore) if(!no_vore)
add_verb(src,/mob/living/proc/vorebelly_printout) //CHOMPEdit TGPanel add_verb(src,/mob/living/verb/vorebelly_printout) //CHOMPEdit TGPanel
if(!vorePanel) if(!vorePanel)
AddComponent(/datum/component/vore_panel) AddComponent(/datum/component/vore_panel)

14
code/modules/power/cable.dm
View File

@@ -208,7 +208,7 @@ var/list/possible_cable_coil_colours = list(
if(c.d1 == UP || c.d2 == UP) if(c.d1 == UP || c.d2 == UP)
qdel(c) qdel(c)
investigate_log("was cut by [key_name(usr, usr.client)] in [user.loc.loc]","wires") investigate_log("was cut by [key_name(user, user.client)] in [user.loc.loc]","wires") //ChompEDIT usr --> user
qdel(src) qdel(src)
return return
@@ -245,7 +245,7 @@ var/list/possible_cable_coil_colours = list(
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(5, 1, src) s.set_up(5, 1, src)
s.start() s.start()
if(usr.stunned) if(user.stunned) //ChompEDIT usr --> user
return 1 return 1
return 0 return 0
@@ -601,8 +601,8 @@ var/list/possible_cable_coil_colours = list(
/obj/item/stack/cable_coil/attackby(obj/item/W, mob/user) /obj/item/stack/cable_coil/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/device/multitool)) if(istype(W, /obj/item/device/multitool))
var/selected_type = tgui_input_list(usr, "Pick new colour.", "Cable Colour", possible_cable_coil_colours) var/selected_type = tgui_input_list(user, "Pick new colour.", "Cable Colour", possible_cable_coil_colours) //ChompEDIT usr --> user
set_cable_color(selected_type, usr) set_cable_color(selected_type, user) //ChompEDIT usr --> user
return return
return ..() return ..()
@@ -980,7 +980,7 @@ var/list/possible_cable_coil_colours = list(
/obj/item/stack/cable_coil/alien/attack_hand(mob/user as mob) /obj/item/stack/cable_coil/alien/attack_hand(mob/user as mob)
if (user.get_inactive_hand() == src) if (user.get_inactive_hand() == src)
var/N = tgui_input_number(usr, "How many units of wire do you want to take from [src]? You can only take up to [amount] at a time.", "Split stacks", 1, amount) var/N = tgui_input_number(user, "How many units of wire do you want to take from [src]? You can only take up to [amount] at a time.", "Split stacks", 1, amount) //ChompEDIT usr --> user
if(N && N <= amount) if(N && N <= amount)
var/obj/item/stack/cable_coil/CC = new/obj/item/stack/cable_coil(user.loc) var/obj/item/stack/cable_coil/CC = new/obj/item/stack/cable_coil(user.loc)
CC.amount = N CC.amount = N
@@ -991,8 +991,8 @@ var/list/possible_cable_coil_colours = list(
src.add_fingerprint(user) src.add_fingerprint(user)
CC.add_fingerprint(user) CC.add_fingerprint(user)
spawn(0) spawn(0)
if (src && usr.machine==src) if (src && user.machine==src) //ChompEDIT usr --> user
src.interact(usr) src.interact(user) //ChompEDIT usr --> user
else else
return return
else else

26
code/modules/vore/eating/living_vr.dm
View File

@@ -157,7 +157,7 @@
else if(istype(I,/obj/item/device/radio/beacon)) else if(istype(I,/obj/item/device/radio/beacon))
var/confirm = tgui_alert(user, "[src == user ? "Eat the beacon?" : "Feed the beacon to [src]?"]", "Confirmation", list("Yes!", "Cancel")) var/confirm = tgui_alert(user, "[src == user ? "Eat the beacon?" : "Feed the beacon to [src]?"]", "Confirmation", list("Yes!", "Cancel"))
if(confirm == "Yes!") if(confirm == "Yes!")
var/obj/belly/B = tgui_input_list(usr, "Which belly?", "Select A Belly", vore_organs) var/obj/belly/B = tgui_input_list(user, "Which belly?", "Select A Belly", vore_organs) //ChompEDIT - user, not usr
if(!istype(B)) if(!istype(B))
return TRUE return TRUE
visible_message("<span class='warning'>[user] is trying to stuff a beacon into [src]'s [lowertext(B.name)]!</span>", visible_message("<span class='warning'>[user] is trying to stuff a beacon into [src]'s [lowertext(B.name)]!</span>",
@@ -598,17 +598,17 @@
/mob/living/proc/eat_held_mob(mob/living/user, mob/living/prey, mob/living/pred) /mob/living/proc/eat_held_mob(mob/living/user, mob/living/prey, mob/living/pred)
var/belly var/belly
if(user != pred) if(user != pred)
belly = tgui_input_list(usr, "Choose Belly", "Belly Choice", pred.feedable_bellies()) //CHOMPEdit belly = tgui_input_list(user, "Choose Belly", "Belly Choice", pred.feedable_bellies()) //CHOMPEdit remove usr
else else
belly = pred.vore_selected belly = pred.vore_selected
return perform_the_nom(user, prey, pred, belly) return perform_the_nom(user, prey, pred, belly)
/mob/living/proc/feed_self_to_grabbed(mob/living/user, mob/living/pred) /mob/living/proc/feed_self_to_grabbed(mob/living/user, mob/living/pred)
var/belly = tgui_input_list(usr, "Choose Belly", "Belly Choice", pred.feedable_bellies()) //CHOMPEdit var/belly = tgui_input_list(user, "Choose Belly", "Belly Choice", pred.feedable_bellies()) //CHOMPEdit - remove usr
return perform_the_nom(user, user, pred, belly) return perform_the_nom(user, user, pred, belly)
/mob/living/proc/feed_grabbed_to_other(mob/living/user, mob/living/prey, mob/living/pred) /mob/living/proc/feed_grabbed_to_other(mob/living/user, mob/living/prey, mob/living/pred)
var/belly = tgui_input_list(usr, "Choose Belly", "Belly Choice", pred.feedable_bellies()) //CHOMPEdit var/belly = tgui_input_list(user, "Choose Belly", "Belly Choice", pred.feedable_bellies()) //CHOMPEdit - remove usr
return perform_the_nom(user, prey, pred, belly) return perform_the_nom(user, prey, pred, belly)
// //
@@ -1154,27 +1154,27 @@
src.Examine_OOC() src.Examine_OOC()
if(href_list["edit_ooc_notes"]) if(href_list["edit_ooc_notes"])
if(usr == src) if(usr == src)
set_metainfo_panel() set_metainfo_panel(usr) //ChompEDIT - usr arg
if(href_list["edit_ooc_note_likes"]) if(href_list["edit_ooc_note_likes"])
if(usr == src) if(usr == src)
set_metainfo_likes() set_metainfo_likes(usr) //ChompEDIT - usr arg
if(href_list["edit_ooc_note_dislikes"]) if(href_list["edit_ooc_note_dislikes"])
if(usr == src) if(usr == src)
set_metainfo_dislikes() set_metainfo_dislikes(usr) //ChompEDIT - usr arg
if(href_list["save_ooc_panel"]) if(href_list["save_ooc_panel"])
if(usr == src) if(usr == src)
save_ooc_panel() save_ooc_panel(usr) //ChompEDIT - usr arg
if(href_list["print_ooc_notes_to_chat"]) if(href_list["print_ooc_notes_to_chat"])
print_ooc_notes_to_chat() print_ooc_notes_to_chat(usr) //ChompEDIT - usr arg
//CHOMPEdit Start //CHOMPEdit Start
if(href_list["edit_ooc_note_favs"]) if(href_list["edit_ooc_note_favs"])
if(usr == src) if(usr == src)
set_metainfo_favs() set_metainfo_favs(usr) //ChompEDIT - usr arg
if(href_list["edit_ooc_note_maybes"]) if(href_list["edit_ooc_note_maybes"])
if(usr == src) if(usr == src)
set_metainfo_maybes() set_metainfo_maybes(usr) //ChompEDIT - usr arg
if(href_list["set_metainfo_ooc_style"]) if(href_list["set_metainfo_ooc_style"])
set_metainfo_ooc_style() set_metainfo_ooc_style(usr) //ChompEDIT - usr arg
//CHOMPEdit End //CHOMPEdit End
return ..() return ..()
@@ -1242,7 +1242,7 @@
icon = 'icons/mob/screen_full_colorized_vore_overlays.dmi' icon = 'icons/mob/screen_full_colorized_vore_overlays.dmi'
*/ //Chomp DISABLE End */ //Chomp DISABLE End
/mob/living/proc/vorebelly_printout() //Spew the vorepanel belly messages into chat window for copypasting. /mob/living/verb/vorebelly_printout() //Spew the vorepanel belly messages into chat window for copypasting. //ChompEDIT proc -> verb
set name = "X-Print Vorebelly Settings" set name = "X-Print Vorebelly Settings"
set category = "Preferences" set category = "Preferences"
set desc = "Print out your vorebelly messages into chat for copypasting." set desc = "Print out your vorebelly messages into chat for copypasting."

208
code/modules/vore/eating/vorepanel_vr.dm
View File

@@ -2076,10 +2076,10 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
//CHOMPEdit Start - Only allow indirect belly viewers to examine //CHOMPEdit Start - Only allow indirect belly viewers to examine
if(user in OB) if(user in OB)
if(isliving(target)) if(isliving(target))
intent = tgui_alert(usr, "What do you want to do to them?","Query",list("Examine","Help Out","Devour")) intent = tgui_alert(user, "What do you want to do to them?","Query",list("Examine","Help Out","Devour")) //ChompEDIT - user, not usr
else if(istype(target, /obj/item)) else if(istype(target, /obj/item))
intent = tgui_alert(usr, "What do you want to do to that?","Query",list("Examine","Use Hand")) intent = tgui_alert(user, "What do you want to do to that?","Query",list("Examine","Use Hand")) //ChompEDIT - user, not usr
//CHOMPEdit End of indirect vorefx changes //CHOMPEdit End of indirect vorefx changes
switch(intent) switch(intent)
@@ -2225,7 +2225,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
if(host.stat) if(host.stat)
to_chat(user,"<span class='warning'>You can't do that in your state!</span>") to_chat(user,"<span class='warning'>You can't do that in your state!</span>")
return TRUE return TRUE
var/obj/belly/choice = tgui_input_list(usr, "Move [target] where?","Select Belly", host.vore_organs) var/obj/belly/choice = tgui_input_list(user, "Move [target] where?","Select Belly", host.vore_organs) //ChompEDIT - user, not usr
if(!choice || !(target in host.vore_selected)) if(!choice || !(target in host.vore_selected))
return TRUE return TRUE
to_chat(target,"<span class='vwarning'>You're squished from [host]'s [lowertext(host.vore_selected.name)] to their [lowertext(choice.name)]!</span>") to_chat(target,"<span class='vwarning'>You're squished from [host]'s [lowertext(host.vore_selected.name)] to their [lowertext(choice.name)]!</span>")
@@ -2458,30 +2458,30 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
if(process_options.len) if(process_options.len)
process_options += "Cancel" process_options += "Cancel"
else else
to_chat(usr, "<span class= 'vwarning'>You cannot instantly process [ourtarget].</span>") to_chat(user, "<span class= 'vwarning'>You cannot instantly process [ourtarget].</span>") //ChompEDIT - user, not usr
return return
var/ourchoice = tgui_input_list(usr, "How would you prefer to process \the [target]? This will perform the given action instantly if the prey accepts.","Instant Process", process_options) var/ourchoice = tgui_input_list(user, "How would you prefer to process \the [target]? This will perform the given action instantly if the prey accepts.","Instant Process", process_options) //ChompEDIT - user, not usr
if(!ourchoice) if(!ourchoice)
return return
if(!ourtarget.client) if(!ourtarget.client)
to_chat(usr, "<span class= 'vwarning'>You cannot instantly process [ourtarget].</span>") to_chat(user, "<span class= 'vwarning'>You cannot instantly process [ourtarget].</span>") //ChompEDIT - user, not usr
return return
var/obj/belly/b = ourtarget.loc var/obj/belly/b = ourtarget.loc
switch(ourchoice) switch(ourchoice)
if("Digest") if("Digest")
if(ourtarget.absorbed) if(ourtarget.absorbed)
to_chat(usr, "<span class= 'vwarning'>\The [ourtarget] is absorbed, and cannot presently be digested.</span>") to_chat(user, "<span class= 'vwarning'>\The [ourtarget] is absorbed, and cannot presently be digested.</span>") //ChompEDIT - user, not usr
return return
if(tgui_alert(ourtarget, "\The [usr] is attempting to instantly digest you. Is this something you are okay with happening to you?","Instant Digest", list("No", "Yes")) != "Yes") if(tgui_alert(ourtarget, "\The [user] is attempting to instantly digest you. Is this something you are okay with happening to you?","Instant Digest", list("No", "Yes")) != "Yes") //ChompEDIT - user, not usr
to_chat(usr, "<span class= 'vwarning'>\The [ourtarget] declined your digest attempt.</span>") to_chat(user, "<span class= 'vwarning'>\The [ourtarget] declined your digest attempt.</span>") //ChompEDIT - user, not usr
to_chat(ourtarget, "<span class= 'vwarning'>You declined the digest attempt.</span>") to_chat(ourtarget, "<span class= 'vwarning'>You declined the digest attempt.</span>")
return return
if(ourtarget.loc != b) if(ourtarget.loc != b)
to_chat(usr, "<span class= 'vwarning'>\The [ourtarget] is no longer in \the [b].</span>") to_chat(user, "<span class= 'vwarning'>\The [ourtarget] is no longer in \the [b].</span>") //ChompEDIT - user, not usr
return return
if(isliving(usr)) if(isliving(user)) //ChompEDIT - user, not usr
var/mob/living/l = usr var/mob/living/l = user //ChompEDIT - user, not usr
var/thismuch = ourtarget.health + 100 var/thismuch = ourtarget.health + 100
if(ishuman(l)) if(ishuman(l))
var/mob/living/carbon/human/h = l var/mob/living/carbon/human/h = l
@@ -2497,29 +2497,29 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
ourtarget.mind?.vore_death = TRUE ourtarget.mind?.vore_death = TRUE
b.handle_digestion_death(ourtarget) b.handle_digestion_death(ourtarget)
if("Absorb") if("Absorb")
if(tgui_alert(ourtarget, "\The [usr] is attempting to instantly absorb you. Is this something you are okay with happening to you?","Instant Absorb", list("No", "Yes")) != "Yes") if(tgui_alert(ourtarget, "\The [user] is attempting to instantly absorb you. Is this something you are okay with happening to you?","Instant Absorb", list("No", "Yes")) != "Yes") //ChompEDIT - user, not usr
to_chat(usr, "<span class= 'vwarning'>\The [ourtarget] declined your absorb attempt.</span>") to_chat(user, "<span class= 'vwarning'>\The [ourtarget] declined your absorb attempt.</span>") //ChompEDIT - user, not usr
to_chat(ourtarget, "<span class= 'vwarning'>You declined the absorb attempt.</span>") to_chat(ourtarget, "<span class= 'vwarning'>You declined the absorb attempt.</span>")
return return
if(ourtarget.loc != b) if(ourtarget.loc != b)
to_chat(usr, "<span class= 'vwarning'>\The [ourtarget] is no longer in \the [b].</span>") to_chat(user, "<span class= 'vwarning'>\The [ourtarget] is no longer in \the [b].</span>") //ChompEDIT - user, not usr
return return
if(isliving(usr)) if(isliving(user)) //ChompEDIT - user, not usr
var/mob/living/l = usr var/mob/living/l = user //ChompEDIT - user, not usr
l.adjust_nutrition(ourtarget.nutrition) l.adjust_nutrition(ourtarget.nutrition)
var/n = 0 - ourtarget.nutrition var/n = 0 - ourtarget.nutrition
ourtarget.adjust_nutrition(n) ourtarget.adjust_nutrition(n)
b.absorb_living(ourtarget) b.absorb_living(ourtarget)
if("Knockout") if("Knockout")
if(tgui_alert(ourtarget, "\The [usr] is attempting to instantly make you unconscious, you will be unable until ejected from the pred. Is this something you are okay with happening to you?","Instant Knockout", list("No", "Yes")) != "Yes") if(tgui_alert(ourtarget, "\The [user] is attempting to instantly make you unconscious, you will be unable until ejected from the pred. Is this something you are okay with happening to you?","Instant Knockout", list("No", "Yes")) != "Yes") //ChompEDIT - user, not usr
to_chat(usr, "<span class= 'vwarning'>\The [ourtarget] declined your knockout attempt.</span>") to_chat(user, "<span class= 'vwarning'>\The [ourtarget] declined your knockout attempt.</span>") //ChompEDIT - user, not usr
to_chat(ourtarget, "<span class= 'vwarning'>You declined the knockout attempt.</span>") to_chat(ourtarget, "<span class= 'vwarning'>You declined the knockout attempt.</span>")
return return
if(ourtarget.loc != b) if(ourtarget.loc != b)
to_chat(usr, "<span class= 'vwarning'>\The [ourtarget] is no longer in \the [b].</span>") to_chat(user, "<span class= 'vwarning'>\The [ourtarget] is no longer in \the [b].</span>") //ChompEDIT - user, not usr
return return
ourtarget.AdjustSleeping(500000) ourtarget.AdjustSleeping(500000)
to_chat(ourtarget, "<span class= 'vwarning'>\The [usr] has put you to sleep, you will remain unconscious until ejected from the belly.</span>") to_chat(ourtarget, "<span class= 'vwarning'>\The [user] has put you to sleep, you will remain unconscious until ejected from the belly.</span>") //ChompEDIT - user, not usr
if("Cancel") if("Cancel")
return return
if("Health Check") if("Health Check")
@@ -2527,7 +2527,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
var/target_health = round((H.health/H.getMaxHealth())*100) var/target_health = round((H.health/H.getMaxHealth())*100)
var/condition var/condition
var/condition_consequences var/condition_consequences
to_chat(usr, "<span class= 'vwarning'>\The [target] is at [target_health]% health.</span>") to_chat(user, "<span class= 'vwarning'>\The [target] is at [target_health]% health.</span>") //ChompEDIT - user, not usr
if(H.blinded) if(H.blinded)
condition += "blinded" condition += "blinded"
condition_consequences += "hear emotes" condition_consequences += "hear emotes"
@@ -2544,18 +2544,18 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
condition += "sleeping" condition += "sleeping"
condition_consequences += "hear or do anything" condition_consequences += "hear or do anything"
if(condition) if(condition)
to_chat(usr, "<span class= 'vwarning'>\The [target] is currently [condition], they will not be able to [condition_consequences].</span>") to_chat(user, "<span class= 'vwarning'>\The [target] is currently [condition], they will not be able to [condition_consequences].</span>") //ChompEDIT - user, not usr
return return
/datum/vore_look/proc/set_attr(mob/user, params) /datum/vore_look/proc/set_attr(mob/user, params)
if(!host.vore_selected) if(!host.vore_selected)
tgui_alert_async(usr, "No belly selected to modify.") tgui_alert_async(user, "No belly selected to modify.") //ChompEDIT - user, not usr
return FALSE return FALSE
var/attr = params["attribute"] var/attr = params["attribute"]
switch(attr) switch(attr)
if("b_name") if("b_name")
var/new_name = html_encode(tgui_input_text(usr,"Belly's new name:","New Name")) var/new_name = html_encode(tgui_input_text(user,"Belly's new name:","New Name")) //ChompEDIT - user, not usr
var/failure_msg var/failure_msg
if(length(new_name) > BELLIES_NAME_MAX || length(new_name) < BELLIES_NAME_MIN) if(length(new_name) > BELLIES_NAME_MAX || length(new_name) < BELLIES_NAME_MIN)
@@ -2581,7 +2581,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
. = TRUE . = TRUE
if("b_mode") if("b_mode")
var/list/menu_list = host.vore_selected.digest_modes.Copy() var/list/menu_list = host.vore_selected.digest_modes.Copy()
var/new_mode = tgui_input_list(usr, "Choose Mode (currently [host.vore_selected.digest_mode])", "Mode Choice", menu_list) var/new_mode = tgui_input_list(user, "Choose Mode (currently [host.vore_selected.digest_mode])", "Mode Choice", menu_list) //ChompEDIT - user, not usr
if(!new_mode) if(!new_mode)
return FALSE return FALSE
@@ -2590,7 +2590,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
. = TRUE . = TRUE
if("b_addons") if("b_addons")
var/list/menu_list = host.vore_selected.mode_flag_list.Copy() var/list/menu_list = host.vore_selected.mode_flag_list.Copy()
var/toggle_addon = tgui_input_list(usr, "Toggle Addon", "Addon Choice", menu_list) var/toggle_addon = tgui_input_list(user, "Toggle Addon", "Addon Choice", menu_list) //ChompEDIT - user, not usr
if(!toggle_addon) if(!toggle_addon)
return FALSE return FALSE
host.vore_selected.mode_flags ^= host.vore_selected.mode_flag_list[toggle_addon] host.vore_selected.mode_flags ^= host.vore_selected.mode_flag_list[toggle_addon]
@@ -2604,16 +2604,16 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
if(host.vore_selected.mode_flags & DM_FLAG_TURBOMODE) if(host.vore_selected.mode_flags & DM_FLAG_TURBOMODE)
host.vore_selected.speedy_mob_processing = TRUE host.vore_selected.speedy_mob_processing = TRUE
START_PROCESSING(SSobj, host.vore_selected) START_PROCESSING(SSobj, host.vore_selected)
to_chat(usr, "<span class= 'warning'>TURBO MODE activated! Belly processing speed tripled! This also affects timed settings, such as autotransfer and liquid generation.</span>") to_chat(user, "<span class= 'warning'>TURBO MODE activated! Belly processing speed tripled! This also affects timed settings, such as autotransfer and liquid generation.</span>") //ChompEDIT - user, not usr
else else
host.vore_selected.speedy_mob_processing = FALSE host.vore_selected.speedy_mob_processing = FALSE
START_PROCESSING(SSbellies, host.vore_selected) START_PROCESSING(SSbellies, host.vore_selected)
to_chat(usr, "<span class= 'warning'>TURBO MODE deactivated. Belly processing returned to normal speed.</span>")//CHOMPAdd End to_chat(user, "<span class= 'warning'>TURBO MODE deactivated. Belly processing returned to normal speed.</span>")//CHOMPAdd End //ChompEDIT - user, not usr
. = TRUE . = TRUE
if("b_item_mode") if("b_item_mode")
var/list/menu_list = host.vore_selected.item_digest_modes.Copy() var/list/menu_list = host.vore_selected.item_digest_modes.Copy()
var/new_mode = tgui_input_list(usr, "Choose Mode (currently [host.vore_selected.item_digest_mode])", "Mode Choice", menu_list) var/new_mode = tgui_input_list(user, "Choose Mode (currently [host.vore_selected.item_digest_mode])", "Mode Choice", menu_list) //ChompEDIT - user, not usr
if(!new_mode) if(!new_mode)
return FALSE return FALSE
@@ -2625,14 +2625,14 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
. = TRUE . = TRUE
if("b_contamination_flavor") if("b_contamination_flavor")
var/list/menu_list = contamination_flavors.Copy() var/list/menu_list = contamination_flavors.Copy()
var/new_flavor = tgui_input_list(usr, "Choose Contamination Flavor Text Type (currently [host.vore_selected.contamination_flavor])", "Flavor Choice", menu_list) var/new_flavor = tgui_input_list(user, "Choose Contamination Flavor Text Type (currently [host.vore_selected.contamination_flavor])", "Flavor Choice", menu_list) //ChompEDIT - user, not usr
if(!new_flavor) if(!new_flavor)
return FALSE return FALSE
host.vore_selected.contamination_flavor = new_flavor host.vore_selected.contamination_flavor = new_flavor
. = TRUE . = TRUE
if("b_contamination_color") if("b_contamination_color")
var/list/menu_list = contamination_colors.Copy() var/list/menu_list = contamination_colors.Copy()
var/new_color = tgui_input_list(usr, "Choose Contamination Color (currently [host.vore_selected.contamination_color])", "Color Choice", menu_list) var/new_color = tgui_input_list(user, "Choose Contamination Color (currently [host.vore_selected.contamination_color])", "Color Choice", menu_list) //ChompEDIT - user, not usr
if(!new_color) if(!new_color)
return FALSE return FALSE
host.vore_selected.contamination_color = new_color host.vore_selected.contamination_color = new_color
@@ -2640,20 +2640,20 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
. = TRUE . = TRUE
if("b_egg_type") if("b_egg_type")
var/list/menu_list = global_vore_egg_types.Copy() var/list/menu_list = global_vore_egg_types.Copy()
var/new_egg_type = tgui_input_list(usr, "Choose Egg Type (currently [host.vore_selected.egg_type])", "Egg Choice", menu_list) var/new_egg_type = tgui_input_list(user, "Choose Egg Type (currently [host.vore_selected.egg_type])", "Egg Choice", menu_list) //ChompEDIT - user, not usr
if(!new_egg_type) if(!new_egg_type)
return FALSE return FALSE
host.vore_selected.egg_type = new_egg_type host.vore_selected.egg_type = new_egg_type
. = TRUE . = TRUE
if("b_egg_name") //CHOMPAdd Start if("b_egg_name") //CHOMPAdd Start
var/new_egg_name = html_encode(tgui_input_text(usr,"Custom Egg Name (Leave empty for default egg name)","New Egg Name")) var/new_egg_name = html_encode(tgui_input_text(user,"Custom Egg Name (Leave empty for default egg name)","New Egg Name")) //ChompEDIT - user, not usr
if(length(new_egg_name) > BELLIES_NAME_MAX) if(length(new_egg_name) > BELLIES_NAME_MAX)
tgui_alert_async(usr, "Entered name too long (max [BELLIES_NAME_MAX]).","Error") tgui_alert_async(user, "Entered name too long (max [BELLIES_NAME_MAX]).","Error") //ChompEDIT - user, not usr
return FALSE return FALSE
host.vore_selected.egg_name = new_egg_name host.vore_selected.egg_name = new_egg_name
. = TRUE . = TRUE
if("b_egg_size") if("b_egg_size")
var/new_egg_size = tgui_input_number(usr,"Custom Egg Size 25% to 200% (0 for automatic item depending egg size from 25% to 100%)","New Egg Size", 0, 200) var/new_egg_size = tgui_input_number(user,"Custom Egg Size 25% to 200% (0 for automatic item depending egg size from 25% to 100%)","New Egg Size", 0, 200) //ChompEDIT - user, not usr
if(new_egg_size == null) if(new_egg_size == null)
return FALSE return FALSE
if(new_egg_size == 0) //Disable. if(new_egg_size == 0) //Disable.
@@ -2672,22 +2672,22 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.vore_selected.storing_nutrition = !host.vore_selected.storing_nutrition host.vore_selected.storing_nutrition = !host.vore_selected.storing_nutrition
. = TRUE//CHOMPAdd End . = TRUE//CHOMPAdd End
if("b_desc") if("b_desc")
var/new_desc = html_encode(tgui_input_text(usr,"Belly Description, '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. ([BELLIES_DESC_MAX] char limit):","New Description",host.vore_selected.desc, multiline = TRUE, prevent_enter = TRUE)) var/new_desc = html_encode(tgui_input_text(user,"Belly Description, '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. ([BELLIES_DESC_MAX] char limit):","New Description",host.vore_selected.desc, multiline = TRUE, prevent_enter = TRUE)) //ChompEDIT - user, not usr
if(new_desc) if(new_desc)
new_desc = readd_quotes(new_desc) new_desc = readd_quotes(new_desc)
if(length(new_desc) > BELLIES_DESC_MAX) if(length(new_desc) > BELLIES_DESC_MAX)
tgui_alert_async(usr, "Entered belly desc too long. [BELLIES_DESC_MAX] character limit.","Error") tgui_alert_async(user, "Entered belly desc too long. [BELLIES_DESC_MAX] character limit.","Error") //ChompEDIT - user, not usr
return FALSE return FALSE
host.vore_selected.desc = new_desc host.vore_selected.desc = new_desc
. = TRUE . = TRUE
if("b_absorbed_desc") if("b_absorbed_desc")
var/new_desc = html_encode(tgui_input_text(usr,"Belly Description for absorbed prey, '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. ([BELLIES_DESC_MAX] char limit):","New Description",host.vore_selected.absorbed_desc, multiline = TRUE, prevent_enter = TRUE)) var/new_desc = html_encode(tgui_input_text(user,"Belly Description for absorbed prey, '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. ([BELLIES_DESC_MAX] char limit):","New Description",host.vore_selected.absorbed_desc, multiline = TRUE, prevent_enter = TRUE)) //ChompEDIT - user, not usr
if(new_desc) if(new_desc)
new_desc = readd_quotes(new_desc) new_desc = readd_quotes(new_desc)
if(length(new_desc) > BELLIES_DESC_MAX) if(length(new_desc) > BELLIES_DESC_MAX)
tgui_alert_async(usr, "Entered belly desc too long. [BELLIES_DESC_MAX] character limit.","Error") tgui_alert_async(user, "Entered belly desc too long. [BELLIES_DESC_MAX] character limit.","Error") //ChompEDIT - user, not usr
return FALSE return FALSE
host.vore_selected.absorbed_desc = new_desc host.vore_selected.absorbed_desc = new_desc
. = TRUE . = TRUE
@@ -3006,34 +3006,34 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.vore_selected.emote_lists = initial(host.vore_selected.emote_lists) host.vore_selected.emote_lists = initial(host.vore_selected.emote_lists)
. = TRUE . = TRUE
if("b_verb") if("b_verb")
var/new_verb = html_encode(tgui_input_text(usr,"New verb when eating (infinitive tense, e.g. nom or swallow):","New Verb")) var/new_verb = html_encode(tgui_input_text(user,"New verb when eating (infinitive tense, e.g. nom or swallow):","New Verb")) //ChompEDIT - user, not usr
if(length(new_verb) > BELLIES_NAME_MAX || length(new_verb) < BELLIES_NAME_MIN) if(length(new_verb) > BELLIES_NAME_MAX || length(new_verb) < BELLIES_NAME_MIN)
tgui_alert_async(usr, "Entered verb length invalid (must be longer than [BELLIES_NAME_MIN], no longer than [BELLIES_NAME_MAX]).","Error") tgui_alert_async(user, "Entered verb length invalid (must be longer than [BELLIES_NAME_MIN], no longer than [BELLIES_NAME_MAX]).","Error") //ChompEDIT - user, not usr
return FALSE return FALSE
host.vore_selected.vore_verb = new_verb host.vore_selected.vore_verb = new_verb
. = TRUE . = TRUE
if("b_release_verb") if("b_release_verb")
var/new_release_verb = html_encode(tgui_input_text(usr,"New verb when releasing from stomach (e.g. expels or coughs or drops):","New Release Verb")) var/new_release_verb = html_encode(tgui_input_text(user,"New verb when releasing from stomach (e.g. expels or coughs or drops):","New Release Verb")) //ChompEDIT - user, not usr
if(length(new_release_verb) > BELLIES_NAME_MAX || length(new_release_verb) < BELLIES_NAME_MIN) if(length(new_release_verb) > BELLIES_NAME_MAX || length(new_release_verb) < BELLIES_NAME_MIN)
tgui_alert_async(usr, "Entered verb length invalid (must be longer than [BELLIES_NAME_MIN], no longer than [BELLIES_NAME_MAX]).","Error") tgui_alert_async(user, "Entered verb length invalid (must be longer than [BELLIES_NAME_MIN], no longer than [BELLIES_NAME_MAX]).","Error") //ChompEDIT - user, not usr
return FALSE return FALSE
host.vore_selected.release_verb = new_release_verb host.vore_selected.release_verb = new_release_verb
. = TRUE . = TRUE
if("b_eating_privacy") if("b_eating_privacy")
var/privacy_choice = tgui_input_list(usr, "Choose your belly-specific preference. Default uses global preference!", "Eating message privacy", list("default", "subtle", "loud"), "default") var/privacy_choice = tgui_input_list(user, "Choose your belly-specific preference. Default uses global preference!", "Eating message privacy", list("default", "subtle", "loud"), "default") //ChompEDIT - user, not usr
if(privacy_choice == null) if(privacy_choice == null)
return FALSE return FALSE
host.vore_selected.eating_privacy_local = privacy_choice host.vore_selected.eating_privacy_local = privacy_choice
. = TRUE . = TRUE
if("b_silicon_belly") if("b_silicon_belly")
var/belly_choice = tgui_alert(usr, "Choose whether you'd like your belly overlay to show from sleepers, \ var/belly_choice = tgui_alert(user, "Choose whether you'd like your belly overlay to show from sleepers, \
normal vore bellies, or an average of the two. NOTE: This ONLY applies to silicons, not human mobs!", "Belly Overlay \ normal vore bellies, or an average of the two. NOTE: This ONLY applies to silicons, not human mobs!", "Belly Overlay \
Preference", Preference",
list("Sleeper", "Vorebelly", "Both")) list("Sleeper", "Vorebelly", "Both")) //ChompEDIT - user, not usr
if(belly_choice == null) if(belly_choice == null)
return FALSE return FALSE
//CHOMPEdit Start, changed to sync the setting among all sleepers for multibelly support //CHOMPEdit Start, changed to sync the setting among all sleepers for multibelly support
@@ -3230,7 +3230,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
. = TRUE . = TRUE
if("b_drainmode") if("b_drainmode")
var/list/menu_list = host.vore_selected.drainmodes.Copy() var/list/menu_list = host.vore_selected.drainmodes.Copy()
var/new_drainmode = tgui_input_list(usr, "Choose Mode (currently [host.vore_selected.digest_mode])", "Mode Choice", menu_list) var/new_drainmode = tgui_input_list(user, "Choose Mode (currently [host.vore_selected.digest_mode])", "Mode Choice", menu_list) //ChompEDIT - user, not usr
if(!new_drainmode) if(!new_drainmode)
return FALSE return FALSE
@@ -3255,12 +3255,12 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
if("b_escapable") if("b_escapable")
if(host.vore_selected.escapable == 0) //Possibly escapable and special interactions. if(host.vore_selected.escapable == 0) //Possibly escapable and special interactions.
host.vore_selected.escapable = 1 host.vore_selected.escapable = 1
to_chat(usr,"<span class='warning'>Prey now have special interactions with your [lowertext(host.vore_selected.name)] depending on your settings.</span>") to_chat(user,"<span class='warning'>Prey now have special interactions with your [lowertext(host.vore_selected.name)] depending on your settings.</span>") //ChompEDIT - user, not usr
else if(host.vore_selected.escapable == 1) //Never escapable. else if(host.vore_selected.escapable == 1) //Never escapable.
host.vore_selected.escapable = 0 host.vore_selected.escapable = 0
to_chat(usr,"<span class='warning'>Prey will not be able to have special interactions with your [lowertext(host.vore_selected.name)].</span>") to_chat(user,"<span class='warning'>Prey will not be able to have special interactions with your [lowertext(host.vore_selected.name)].</span>") //ChompEDIT - user, not usr
else else
tgui_alert_async(usr, "Something went wrong. Your stomach will now not have special interactions. Press the button enable them again and tell a dev.","Error") //If they somehow have a varable that's not 0 or 1 tgui_alert_async(user, "Something went wrong. Your stomach will now not have special interactions. Press the button enable them again and tell a dev.","Error") //If they somehow have a varable that's not 0 or 1 //ChompEDIT - user, not usr
host.vore_selected.escapable = 0 host.vore_selected.escapable = 0
. = TRUE . = TRUE
if("b_escapechance") if("b_escapechance")
@@ -3284,7 +3284,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.vore_selected.transferchance = sanitize_integer(transfer_chance_input, 0, 100, initial(host.vore_selected.transferchance)) host.vore_selected.transferchance = sanitize_integer(transfer_chance_input, 0, 100, initial(host.vore_selected.transferchance))
. = TRUE . = TRUE
if("b_transferlocation") if("b_transferlocation")
var/obj/belly/choice = tgui_input_list(usr, "Where do you want your [lowertext(host.vore_selected.name)] to lead if prey resists?","Select Belly", (host.vore_organs + "None - Remove" - host.vore_selected)) var/obj/belly/choice = tgui_input_list(user, "Where do you want your [lowertext(host.vore_selected.name)] to lead if prey resists?","Select Belly", (host.vore_organs + "None - Remove" - host.vore_selected)) //ChompEDIT - user, not usr
if(!choice) //They cancelled, no changes if(!choice) //They cancelled, no changes
return FALSE return FALSE
else if(choice == "None - Remove") else if(choice == "None - Remove")
@@ -3298,7 +3298,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.vore_selected.transferchance_secondary = sanitize_integer(transfer_secondary_chance_input, 0, 100, initial(host.vore_selected.transferchance_secondary)) host.vore_selected.transferchance_secondary = sanitize_integer(transfer_secondary_chance_input, 0, 100, initial(host.vore_selected.transferchance_secondary))
. = TRUE . = TRUE
if("b_transferlocation_secondary") if("b_transferlocation_secondary")
var/obj/belly/choice_secondary = tgui_input_list(usr, "Where do you want your [lowertext(host.vore_selected.name)] to alternately lead if prey resists?","Select Belly", (host.vore_organs + "None - Remove" - host.vore_selected)) var/obj/belly/choice_secondary = tgui_input_list(user, "Where do you want your [lowertext(host.vore_selected.name)] to alternately lead if prey resists?","Select Belly", (host.vore_organs + "None - Remove" - host.vore_selected)) //ChompEDIT - user, not usr
if(!choice_secondary) //They cancelled, no changes if(!choice_secondary) //They cancelled, no changes
return FALSE return FALSE
@@ -3328,7 +3328,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.vore_selected.autotransferwait = sanitize_integer(autotransferwait_input*10, 10, 18000, initial(host.vore_selected.autotransferwait)) host.vore_selected.autotransferwait = sanitize_integer(autotransferwait_input*10, 10, 18000, initial(host.vore_selected.autotransferwait))
. = TRUE . = TRUE
if("b_autotransferlocation") if("b_autotransferlocation")
var/obj/belly/choice = tgui_input_list(usr, "Where do you want your [lowertext(host.vore_selected.name)] auto-transfer to?","Select Belly", (host.vore_organs + "None - Remove" - host.vore_selected)) var/obj/belly/choice = tgui_input_list(user, "Where do you want your [lowertext(host.vore_selected.name)] auto-transfer to?","Select Belly", (host.vore_organs + "None - Remove" - host.vore_selected)) //ChompEDIT - user, not usr
if(!choice) //They cancelled, no changes if(!choice) //They cancelled, no changes
return FALSE return FALSE
else if(choice == "None - Remove") else if(choice == "None - Remove")
@@ -3342,7 +3342,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.vore_selected.autotransferchance_secondary = sanitize_integer(autotransferchance_secondary_input, 0, 100, initial(host.vore_selected.autotransferchance_secondary)) host.vore_selected.autotransferchance_secondary = sanitize_integer(autotransferchance_secondary_input, 0, 100, initial(host.vore_selected.autotransferchance_secondary))
. = TRUE . = TRUE
if("b_autotransferlocation_secondary") if("b_autotransferlocation_secondary")
var/obj/belly/choice = tgui_input_list(usr, "Where do you want your secondary [lowertext(host.vore_selected.name)] auto-transfer to?","Select Belly", (host.vore_organs + "None - Remove" - host.vore_selected)) var/obj/belly/choice = tgui_input_list(user, "Where do you want your secondary [lowertext(host.vore_selected.name)] auto-transfer to?","Select Belly", (host.vore_organs + "None - Remove" - host.vore_selected)) //ChompEDIT - user, not usr
if(!choice) //They cancelled, no changes if(!choice) //They cancelled, no changes
return FALSE return FALSE
else if(choice == "None - Remove") else if(choice == "None - Remove")
@@ -3352,28 +3352,28 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
. = TRUE . = TRUE
if("b_autotransfer_whitelist") if("b_autotransfer_whitelist")
var/list/menu_list = host.vore_selected.autotransfer_flags_list.Copy() var/list/menu_list = host.vore_selected.autotransfer_flags_list.Copy()
var/toggle_addon = tgui_input_list(usr, "Toggle Whitelist", "Whitelist Choice", menu_list) var/toggle_addon = tgui_input_list(user, "Toggle Whitelist", "Whitelist Choice", menu_list) //ChompEDIT - user, not usr
if(!toggle_addon) if(!toggle_addon)
return FALSE return FALSE
host.vore_selected.autotransfer_whitelist ^= host.vore_selected.autotransfer_flags_list[toggle_addon] host.vore_selected.autotransfer_whitelist ^= host.vore_selected.autotransfer_flags_list[toggle_addon]
. = TRUE . = TRUE
if("b_autotransfer_blacklist") if("b_autotransfer_blacklist")
var/list/menu_list = host.vore_selected.autotransfer_flags_list.Copy() var/list/menu_list = host.vore_selected.autotransfer_flags_list.Copy()
var/toggle_addon = tgui_input_list(usr, "Toggle Blacklist", "Blacklist Choice", menu_list) var/toggle_addon = tgui_input_list(user, "Toggle Blacklist", "Blacklist Choice", menu_list) //ChompEDIT - user, not usr
if(!toggle_addon) if(!toggle_addon)
return FALSE return FALSE
host.vore_selected.autotransfer_blacklist ^= host.vore_selected.autotransfer_flags_list[toggle_addon] host.vore_selected.autotransfer_blacklist ^= host.vore_selected.autotransfer_flags_list[toggle_addon]
. = TRUE . = TRUE
if("b_autotransfer_secondary_whitelist") if("b_autotransfer_secondary_whitelist")
var/list/menu_list = host.vore_selected.autotransfer_flags_list.Copy() var/list/menu_list = host.vore_selected.autotransfer_flags_list.Copy()
var/toggle_addon = tgui_input_list(usr, "Toggle Whitelist", "Whitelist Choice", menu_list) var/toggle_addon = tgui_input_list(user, "Toggle Whitelist", "Whitelist Choice", menu_list) //ChompEDIT - user, not usr
if(!toggle_addon) if(!toggle_addon)
return FALSE return FALSE
host.vore_selected.autotransfer_secondary_whitelist ^= host.vore_selected.autotransfer_flags_list[toggle_addon] host.vore_selected.autotransfer_secondary_whitelist ^= host.vore_selected.autotransfer_flags_list[toggle_addon]
. = TRUE . = TRUE
if("b_autotransfer_secondary_blacklist") if("b_autotransfer_secondary_blacklist")
var/list/menu_list = host.vore_selected.autotransfer_flags_list.Copy() var/list/menu_list = host.vore_selected.autotransfer_flags_list.Copy()
var/toggle_addon = tgui_input_list(usr, "Toggle Blacklist", "Blacklist Choice", menu_list) var/toggle_addon = tgui_input_list(user, "Toggle Blacklist", "Blacklist Choice", menu_list) //ChompEDIT - user, not usr
if(!toggle_addon) if(!toggle_addon)
return FALSE return FALSE
host.vore_selected.autotransfer_secondary_blacklist ^= host.vore_selected.autotransfer_flags_list[toggle_addon] host.vore_selected.autotransfer_secondary_blacklist ^= host.vore_selected.autotransfer_flags_list[toggle_addon]
@@ -3381,28 +3381,28 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
. = TRUE . = TRUE
if("b_autotransfer_whitelist_items") if("b_autotransfer_whitelist_items")
var/list/menu_list = host.vore_selected.autotransfer_flags_list_items.Copy() var/list/menu_list = host.vore_selected.autotransfer_flags_list_items.Copy()
var/toggle_addon = tgui_input_list(usr, "Toggle Whitelist", "Whitelist Choice", menu_list) var/toggle_addon = tgui_input_list(user, "Toggle Whitelist", "Whitelist Choice", menu_list) //ChompEDIT - user, not usr
if(!toggle_addon) if(!toggle_addon)
return FALSE return FALSE
host.vore_selected.autotransfer_whitelist_items ^= host.vore_selected.autotransfer_flags_list_items[toggle_addon] host.vore_selected.autotransfer_whitelist_items ^= host.vore_selected.autotransfer_flags_list_items[toggle_addon]
. = TRUE . = TRUE
if("b_autotransfer_blacklist_items") if("b_autotransfer_blacklist_items")
var/list/menu_list = host.vore_selected.autotransfer_flags_list_items.Copy() var/list/menu_list = host.vore_selected.autotransfer_flags_list_items.Copy()
var/toggle_addon = tgui_input_list(usr, "Toggle Blacklist", "Blacklist Choice", menu_list) var/toggle_addon = tgui_input_list(user, "Toggle Blacklist", "Blacklist Choice", menu_list) //ChompEDIT - user, not usr
if(!toggle_addon) if(!toggle_addon)
return FALSE return FALSE
host.vore_selected.autotransfer_blacklist_items ^= host.vore_selected.autotransfer_flags_list_items[toggle_addon] host.vore_selected.autotransfer_blacklist_items ^= host.vore_selected.autotransfer_flags_list_items[toggle_addon]
. = TRUE . = TRUE
if("b_autotransfer_secondary_whitelist_items") if("b_autotransfer_secondary_whitelist_items")
var/list/menu_list = host.vore_selected.autotransfer_flags_list_items.Copy() var/list/menu_list = host.vore_selected.autotransfer_flags_list_items.Copy()
var/toggle_addon = tgui_input_list(usr, "Toggle Whitelist", "Whitelist Choice", menu_list) var/toggle_addon = tgui_input_list(user, "Toggle Whitelist", "Whitelist Choice", menu_list) //ChompEDIT - user, not usr
if(!toggle_addon) if(!toggle_addon)
return FALSE return FALSE
host.vore_selected.autotransfer_secondary_whitelist_items ^= host.vore_selected.autotransfer_flags_list_items[toggle_addon] host.vore_selected.autotransfer_secondary_whitelist_items ^= host.vore_selected.autotransfer_flags_list_items[toggle_addon]
. = TRUE . = TRUE
if("b_autotransfer_secondary_blacklist_items") if("b_autotransfer_secondary_blacklist_items")
var/list/menu_list = host.vore_selected.autotransfer_flags_list_items.Copy() var/list/menu_list = host.vore_selected.autotransfer_flags_list_items.Copy()
var/toggle_addon = tgui_input_list(usr, "Toggle Blacklist", "Blacklist Choice", menu_list) var/toggle_addon = tgui_input_list(user, "Toggle Blacklist", "Blacklist Choice", menu_list) //ChompEDIT - user, not usr
if(!toggle_addon) if(!toggle_addon)
return FALSE return FALSE
host.vore_selected.autotransfer_secondary_blacklist_items ^= host.vore_selected.autotransfer_flags_list_items[toggle_addon] host.vore_selected.autotransfer_secondary_blacklist_items ^= host.vore_selected.autotransfer_flags_list_items[toggle_addon]
@@ -3438,43 +3438,43 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.vore_selected.clear_preview(host) //Clears the stomach overlay. This is a failsafe but shouldn't occur. host.vore_selected.clear_preview(host) //Clears the stomach overlay. This is a failsafe but shouldn't occur.
. = TRUE . = TRUE
if("b_fullscreen_color") if("b_fullscreen_color")
var/newcolor = input(usr, "Choose a color.", "", host.vore_selected.belly_fullscreen_color) as color|null var/newcolor = input(user, "Choose a color.", "", host.vore_selected.belly_fullscreen_color) as color|null //ChompEDIT - user, not usr
if(newcolor) if(newcolor)
host.vore_selected.belly_fullscreen_color = newcolor host.vore_selected.belly_fullscreen_color = newcolor
host.vore_selected.update_internal_overlay() host.vore_selected.update_internal_overlay()
. = TRUE . = TRUE
if("b_fullscreen_color2") if("b_fullscreen_color2")
var/newcolor2 = input(usr, "Choose a color.", "", host.vore_selected.belly_fullscreen_color2) as color|null var/newcolor2 = input(user, "Choose a color.", "", host.vore_selected.belly_fullscreen_color2) as color|null //ChompEDIT - user, not usr
if(newcolor2) if(newcolor2)
host.vore_selected.belly_fullscreen_color2 = newcolor2 host.vore_selected.belly_fullscreen_color2 = newcolor2
host.vore_selected.update_internal_overlay() host.vore_selected.update_internal_overlay()
. = TRUE . = TRUE
if("b_fullscreen_color3") if("b_fullscreen_color3")
var/newcolor3 = input(usr, "Choose a color.", "", host.vore_selected.belly_fullscreen_color3) as color|null var/newcolor3 = input(user, "Choose a color.", "", host.vore_selected.belly_fullscreen_color3) as color|null //ChompEDIT - user, not usr
if(newcolor3) if(newcolor3)
host.vore_selected.belly_fullscreen_color3 = newcolor3 host.vore_selected.belly_fullscreen_color3 = newcolor3
host.vore_selected.update_internal_overlay() host.vore_selected.update_internal_overlay()
. = TRUE . = TRUE
if("b_fullscreen_color4") if("b_fullscreen_color4")
var/newcolor4 = input(usr, "Choose a color.", "", host.vore_selected.belly_fullscreen_color4) as color|null var/newcolor4 = input(user, "Choose a color.", "", host.vore_selected.belly_fullscreen_color4) as color|null //ChompEDIT - user, not usr
if(newcolor4) if(newcolor4)
host.vore_selected.belly_fullscreen_color4 = newcolor4 host.vore_selected.belly_fullscreen_color4 = newcolor4
host.vore_selected.update_internal_overlay() host.vore_selected.update_internal_overlay()
. = TRUE . = TRUE
if("b_fullscreen_alpha") if("b_fullscreen_alpha")
var/newalpha = tgui_input_number(usr, "Set alpha transparency between 0-255", "Vore Alpha",255,255,0,0,1) var/newalpha = tgui_input_number(user, "Set alpha transparency between 0-255", "Vore Alpha",255,255,0,0,1) //ChompEDIT - user, not usr
if(newalpha) if(newalpha)
host.vore_selected.belly_fullscreen_alpha = newalpha host.vore_selected.belly_fullscreen_alpha = newalpha
host.vore_selected.update_internal_overlay() host.vore_selected.update_internal_overlay()
. = TRUE . = TRUE
/* //Chomp REMOVE - use our solution, not upstream's /* //Chomp REMOVE - use our solution, not upstream's
if("b_fullscreen_color_secondary") if("b_fullscreen_color_secondary")
var/newcolor = input(usr, "Choose a color.", "", host.vore_selected.belly_fullscreen_color_secondary) as color|null var/newcolor = input(user, "Choose a color.", "", host.vore_selected.belly_fullscreen_color_secondary) as color|null //ChompEDIT - user, not usr
if(newcolor) if(newcolor)
host.vore_selected.belly_fullscreen_color_secondary = newcolor host.vore_selected.belly_fullscreen_color_secondary = newcolor
. = TRUE . = TRUE
if("b_fullscreen_color_trinary") if("b_fullscreen_color_trinary")
var/newcolor = input(usr, "Choose a color.", "", host.vore_selected.belly_fullscreen_color_trinary) as color|null var/newcolor = input(user, "Choose a color.", "", host.vore_selected.belly_fullscreen_color_trinary) as color|null //ChompEDIT - user, not usr
if(newcolor) if(newcolor)
host.vore_selected.belly_fullscreen_color_trinary = newcolor host.vore_selected.belly_fullscreen_color_trinary = newcolor
. = TRUE . = TRUE
@@ -3483,7 +3483,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.vore_selected.save_digest_mode = !host.vore_selected.save_digest_mode host.vore_selected.save_digest_mode = !host.vore_selected.save_digest_mode
. = TRUE . = TRUE
if("b_del") if("b_del")
var/alert = tgui_alert(usr, "Are you sure you want to delete your [lowertext(host.vore_selected.name)]?","Confirmation",list("Cancel","Delete")) var/alert = tgui_alert(user, "Are you sure you want to delete your [lowertext(host.vore_selected.name)]?","Confirmation",list("Cancel","Delete")) //ChompEDIT - user, not usr
if(!(alert == "Delete")) if(!(alert == "Delete"))
return FALSE return FALSE
@@ -3521,7 +3521,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.vore_selected.vorespawn_blacklist = !host.vore_selected.vorespawn_blacklist host.vore_selected.vorespawn_blacklist = !host.vore_selected.vorespawn_blacklist
. = TRUE . = TRUE
if("b_belly_sprite_to_affect") //CHOMP Addition if("b_belly_sprite_to_affect") //CHOMP Addition
var/belly_choice = tgui_input_list(usr, "Which belly sprite do you want your [lowertext(host.vore_selected.name)] to affect?","Select Region", host.vore_icon_bellies) var/belly_choice = tgui_input_list(user, "Which belly sprite do you want your [lowertext(host.vore_selected.name)] to affect?","Select Region", host.vore_icon_bellies) //ChompEDIT - user, not usr
if(!belly_choice) //They cancelled, no changes if(!belly_choice) //They cancelled, no changes
return FALSE return FALSE
else else
@@ -3530,7 +3530,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
. = TRUE . = TRUE
if("b_vore_sprite_flags") //CHOMP Addition if("b_vore_sprite_flags") //CHOMP Addition
var/list/menu_list = host.vore_selected.vore_sprite_flag_list.Copy() var/list/menu_list = host.vore_selected.vore_sprite_flag_list.Copy()
var/toggle_vs_flag = tgui_input_list(usr, "Toggle Vore Sprite Modes", "Mode Choice", menu_list) var/toggle_vs_flag = tgui_input_list(user, "Toggle Vore Sprite Modes", "Mode Choice", menu_list) //ChompEDIT - user, not usr
if(!toggle_vs_flag) if(!toggle_vs_flag)
return FALSE return FALSE
host.vore_selected.vore_sprite_flags ^= host.vore_selected.vore_sprite_flag_list[toggle_vs_flag] host.vore_selected.vore_sprite_flags ^= host.vore_selected.vore_sprite_flag_list[toggle_vs_flag]
@@ -3583,7 +3583,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.update_fullness() host.update_fullness()
. = TRUE . = TRUE
if("b_undergarment_choice") //CHOMP Addition if("b_undergarment_choice") //CHOMP Addition
var/datum/category_group/underwear/undergarment_choice = tgui_input_list(usr, "Which undergarment do you want to enable when your [lowertext(host.vore_selected.name)] is filled?","Select Undergarment Class", global_underwear.categories) var/datum/category_group/underwear/undergarment_choice = tgui_input_list(user, "Which undergarment do you want to enable when your [lowertext(host.vore_selected.name)] is filled?","Select Undergarment Class", global_underwear.categories) //ChompEDIT - user, not usr
if(!undergarment_choice) //They cancelled, no changes if(!undergarment_choice) //They cancelled, no changes
return FALSE return FALSE
else else
@@ -3592,7 +3592,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
. = TRUE . = TRUE
if("b_undergarment_if_none") //CHOMP Addition if("b_undergarment_if_none") //CHOMP Addition
var/datum/category_group/underwear/UWC = global_underwear.categories_by_name[host.vore_selected.undergarment_chosen] var/datum/category_group/underwear/UWC = global_underwear.categories_by_name[host.vore_selected.undergarment_chosen]
var/datum/category_item/underwear/selected_underwear = tgui_input_list(usr, "If no undergarment is equipped, which undergarment style do you want to use?","Select Underwear Style",UWC.items,host.vore_selected.undergarment_if_none) var/datum/category_item/underwear/selected_underwear = tgui_input_list(user, "If no undergarment is equipped, which undergarment style do you want to use?","Select Underwear Style",UWC.items,host.vore_selected.undergarment_if_none) //ChompEDIT - user, not usr
if(!selected_underwear) //They cancelled, no changes if(!selected_underwear) //They cancelled, no changes
return FALSE return FALSE
else else
@@ -3600,30 +3600,30 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.update_fullness() host.update_fullness()
host.updateVRPanel() host.updateVRPanel()
if("b_undergarment_color") //CHOMP Addition if("b_undergarment_color") //CHOMP Addition
var/newcolor = input(usr, "Choose a color.", "", host.vore_selected.undergarment_color) as color|null var/newcolor = input(user, "Choose a color.", "", host.vore_selected.undergarment_color) as color|null //ChompEDIT - user, not usr
if(newcolor) if(newcolor)
host.vore_selected.undergarment_color = newcolor host.vore_selected.undergarment_color = newcolor
host.update_fullness() host.update_fullness()
. = TRUE . = TRUE
if("b_tail_to_change_to") //CHOMP Addition if("b_tail_to_change_to") //CHOMP Addition
var/tail_choice = tgui_input_list(usr, "Which tail sprite do you want to use when your [lowertext(host.vore_selected.name)] is filled?","Select Sprite", global.tail_styles_list) var/tail_choice = tgui_input_list(user, "Which tail sprite do you want to use when your [lowertext(host.vore_selected.name)] is filled?","Select Sprite", global.tail_styles_list) //ChompEDIT - user, not usr
if(!tail_choice) //They cancelled, no changes if(!tail_choice) //They cancelled, no changes
return FALSE return FALSE
else else
host.vore_selected.tail_to_change_to = tail_choice host.vore_selected.tail_to_change_to = tail_choice
. = TRUE . = TRUE
if("b_tail_color") // CHOMP Addition if("b_tail_color") // CHOMP Addition
var/newcolor = input(usr, "Choose tail color.", "", host.vore_selected.tail_colouration) as color|null var/newcolor = input(user, "Choose tail color.", "", host.vore_selected.tail_colouration) as color|null //ChompEDIT - user, not usr
if(newcolor) if(newcolor)
host.vore_selected.tail_colouration = newcolor host.vore_selected.tail_colouration = newcolor
. = TRUE . = TRUE
if("b_tail_color2") // CHOMP Addition if("b_tail_color2") // CHOMP Addition
var/newcolor = input(usr, "Choose tail secondary color.", "", host.vore_selected.tail_extra_overlay) as color|null var/newcolor = input(user, "Choose tail secondary color.", "", host.vore_selected.tail_extra_overlay) as color|null //ChompEDIT - user, not usr
if(newcolor) if(newcolor)
host.vore_selected.tail_extra_overlay = newcolor host.vore_selected.tail_extra_overlay = newcolor
. = TRUE . = TRUE
if("b_tail_color3") // CHOMP Addition if("b_tail_color3") // CHOMP Addition
var/newcolor = input(usr, "Choose tail tertiary color.", "", host.vore_selected.tail_extra_overlay2) as color|null var/newcolor = input(user, "Choose tail tertiary color.", "", host.vore_selected.tail_extra_overlay2) as color|null //ChompEDIT - user, not usr
if(newcolor) if(newcolor)
host.vore_selected.tail_extra_overlay2 = newcolor host.vore_selected.tail_extra_overlay2 = newcolor
. = TRUE . = TRUE
@@ -3642,18 +3642,18 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
if("b_show_liq") if("b_show_liq")
if(!host.vore_selected.show_liquids) if(!host.vore_selected.show_liquids)
host.vore_selected.show_liquids = 1 host.vore_selected.show_liquids = 1
to_chat(usr,"<span class='warning'>Your [lowertext(host.vore_selected.name)] now has liquid options.</span>") to_chat(user,"<span class='warning'>Your [lowertext(host.vore_selected.name)] now has liquid options.</span>") //ChompEDIT - user, not usr
else else
host.vore_selected.show_liquids = 0 host.vore_selected.show_liquids = 0
to_chat(usr,"<span class='warning'>Your [lowertext(host.vore_selected.name)] no longer has liquid options.</span>") to_chat(user,"<span class='warning'>Your [lowertext(host.vore_selected.name)] no longer has liquid options.</span>") //ChompEDIT - user, not usr
. = TRUE . = TRUE
if("b_liq_reagent_gen") if("b_liq_reagent_gen")
if(!host.vore_selected.reagentbellymode) //liquid container adjustments and interactions. if(!host.vore_selected.reagentbellymode) //liquid container adjustments and interactions.
host.vore_selected.reagentbellymode = 1 host.vore_selected.reagentbellymode = 1
to_chat(usr,"<span class='warning'>Your [lowertext(host.vore_selected.name)] now has interactions which can produce liquids.</span>") to_chat(user,"<span class='warning'>Your [lowertext(host.vore_selected.name)] now has interactions which can produce liquids.</span>") //ChompEDIT - user, not usr
else //Doesnt produce liquids else //Doesnt produce liquids
host.vore_selected.reagentbellymode = 0 host.vore_selected.reagentbellymode = 0
to_chat(usr,"<span class='warning'>Your [lowertext(host.vore_selected.name)] wont produce liquids, liquids already in your [lowertext(host.vore_selected.name)] must be emptied out or removed with purge.</span>") to_chat(user,"<span class='warning'>Your [lowertext(host.vore_selected.name)] wont produce liquids, liquids already in your [lowertext(host.vore_selected.name)] must be emptied out or removed with purge.</span>") //ChompEDIT - user, not usr
. = TRUE . = TRUE
if("b_liq_reagent_type") if("b_liq_reagent_type")
var/list/menu_list = host.vore_selected.reagent_choices.Copy() //Useful if we want to make certain races, synths, borgs, and other things result in additional reagents to produce - Jack var/list/menu_list = host.vore_selected.reagent_choices.Copy() //Useful if we want to make certain races, synths, borgs, and other things result in additional reagents to produce - Jack
@@ -3665,7 +3665,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.vore_selected.ReagentSwitch() // For changing variables when a new reagent is chosen host.vore_selected.ReagentSwitch() // For changing variables when a new reagent is chosen
. = TRUE . = TRUE
if("b_liq_reagent_name") if("b_liq_reagent_name")
var/new_name = html_encode(input(usr,"New name for liquid shown when transfering and dumping on floor (The actual liquid's name is still the same):","New Name") as text|null) var/new_name = html_encode(input(user,"New name for liquid shown when transfering and dumping on floor (The actual liquid's name is still the same):","New Name") as text|null) //ChompEDIT - user, not usr
if(length(new_name) > BELLIES_NAME_MAX || length(new_name) < BELLIES_NAME_MIN) if(length(new_name) > BELLIES_NAME_MAX || length(new_name) < BELLIES_NAME_MIN)
alert("Entered name length invalid (must be longer than [BELLIES_NAME_MIN], no longer than [BELLIES_NAME_MAX]).","Error") alert("Entered name length invalid (must be longer than [BELLIES_NAME_MIN], no longer than [BELLIES_NAME_MAX]).","Error")
@@ -3674,7 +3674,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.vore_selected.reagent_name = new_name host.vore_selected.reagent_name = new_name
. = TRUE . = TRUE
if("b_liq_reagent_transfer_verb") if("b_liq_reagent_transfer_verb")
var/new_verb = html_encode(input(usr,"New verb when liquid is transfered from this belly:","New Verb") as text|null) var/new_verb = html_encode(input(user,"New verb when liquid is transfered from this belly:","New Verb") as text|null) //ChompEDIT - user, not usr
if(length(new_verb) > BELLIES_NAME_MAX || length(new_verb) < BELLIES_NAME_MIN) if(length(new_verb) > BELLIES_NAME_MAX || length(new_verb) < BELLIES_NAME_MIN)
alert("Entered verb length invalid (must be longer than [BELLIES_NAME_MIN], no longer than [BELLIES_NAME_MAX]).","Error") alert("Entered verb length invalid (must be longer than [BELLIES_NAME_MIN], no longer than [BELLIES_NAME_MAX]).","Error")
@@ -3712,10 +3712,10 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
if("b_liq_sloshing") if("b_liq_sloshing")
if(!host.vore_selected.vorefootsteps_sounds) if(!host.vore_selected.vorefootsteps_sounds)
host.vore_selected.vorefootsteps_sounds = 1 host.vore_selected.vorefootsteps_sounds = 1
to_chat(usr,"<span class='warning'>Your [lowertext(host.vore_selected.name)] can now make sounds when you walk around depending on how full you are.</span>") to_chat(user,"<span class='warning'>Your [lowertext(host.vore_selected.name)] can now make sounds when you walk around depending on how full you are.</span>") //ChompEDIT - user, not usr
else else
host.vore_selected.vorefootsteps_sounds = 0 host.vore_selected.vorefootsteps_sounds = 0
to_chat(usr,"<span class='warning'>Your [lowertext(host.vore_selected.name)] wont make any liquid sounds no matter how full it is.</span>") to_chat(user,"<span class='warning'>Your [lowertext(host.vore_selected.name)] wont make any liquid sounds no matter how full it is.</span>") //ChompEDIT - user, not usr
. = TRUE . = TRUE
if("b_liq_reagent_addons") if("b_liq_reagent_addons")
var/list/menu_list = host.vore_selected.reagent_mode_flag_list.Copy() var/list/menu_list = host.vore_selected.reagent_mode_flag_list.Copy()
@@ -3727,10 +3727,10 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
if("b_liquid_overlay") if("b_liquid_overlay")
if(!host.vore_selected.liquid_overlay) if(!host.vore_selected.liquid_overlay)
host.vore_selected.liquid_overlay = 1 host.vore_selected.liquid_overlay = 1
to_chat(usr,"<span class='warning'>Your [lowertext(host.vore_selected.name)] now has liquid overlay enabled.</span>") to_chat(user,"<span class='warning'>Your [lowertext(host.vore_selected.name)] now has liquid overlay enabled.</span>") //ChompEDIT - user, not usr
else else
host.vore_selected.liquid_overlay = 0 host.vore_selected.liquid_overlay = 0
to_chat(usr,"<span class='warning'>Your [lowertext(host.vore_selected.name)] no longer has liquid overlay enabled.</span>") to_chat(user,"<span class='warning'>Your [lowertext(host.vore_selected.name)] no longer has liquid overlay enabled.</span>") //ChompEDIT - user, not usr
. = TRUE . = TRUE
if("b_max_liquid_level") if("b_max_liquid_level")
var/new_max_liquid_level = input(user, "Set custom maximum liquid level. 0-100%", "Set Custom Max Level.", host.vore_selected.max_liquid_level) as num|null var/new_max_liquid_level = input(user, "Set custom maximum liquid level. 0-100%", "Set Custom Max Level.", host.vore_selected.max_liquid_level) as num|null
@@ -3741,7 +3741,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.vore_selected.update_internal_overlay() host.vore_selected.update_internal_overlay()
. = TRUE . = TRUE
if("b_custom_reagentcolor") if("b_custom_reagentcolor")
var/newcolor = input(usr, "Choose custom color for liquid overlay. Cancel for normal reagent color.", "", host.vore_selected.custom_reagentcolor) as color|null var/newcolor = input(user, "Choose custom color for liquid overlay. Cancel for normal reagent color.", "", host.vore_selected.custom_reagentcolor) as color|null //ChompEDIT - user, not usr
if(newcolor) if(newcolor)
host.vore_selected.custom_reagentcolor = newcolor host.vore_selected.custom_reagentcolor = newcolor
else else
@@ -3749,7 +3749,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.vore_selected.update_internal_overlay() host.vore_selected.update_internal_overlay()
. = TRUE . = TRUE
if("b_custom_reagentalpha") if("b_custom_reagentalpha")
var/newalpha = tgui_input_number(usr, "Set alpha transparency between 0-255. Leave blank to use capacity based alpha.", "Custom Liquid Alpha",255,255,0,0,1) var/newalpha = tgui_input_number(user, "Set alpha transparency between 0-255. Leave blank to use capacity based alpha.", "Custom Liquid Alpha",255,255,0,0,1) //ChompEDIT - user, not usr
if(newalpha != null) if(newalpha != null)
host.vore_selected.custom_reagentalpha = newalpha host.vore_selected.custom_reagentalpha = newalpha
else else
@@ -3759,28 +3759,28 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
if("b_reagent_touches") if("b_reagent_touches")
if(!host.vore_selected.reagent_touches) if(!host.vore_selected.reagent_touches)
host.vore_selected.reagent_touches = 1 host.vore_selected.reagent_touches = 1
to_chat(usr,"<span class='warning'>Your [lowertext(host.vore_selected.name)] will now apply reagents to creatures when digesting.</span>") to_chat(user,"<span class='warning'>Your [lowertext(host.vore_selected.name)] will now apply reagents to creatures when digesting.</span>") //ChompEDIT - user, not usr
else else
host.vore_selected.reagent_touches = 0 host.vore_selected.reagent_touches = 0
to_chat(usr,"<span class='warning'>Your [lowertext(host.vore_selected.name)] will no longer apply reagents to creatures when digesting.</span>") to_chat(user,"<span class='warning'>Your [lowertext(host.vore_selected.name)] will no longer apply reagents to creatures when digesting.</span>") //ChompEDIT - user, not usr
. = TRUE . = TRUE
if("b_mush_overlay") if("b_mush_overlay")
if(!host.vore_selected.mush_overlay) if(!host.vore_selected.mush_overlay)
host.vore_selected.mush_overlay = 1 host.vore_selected.mush_overlay = 1
to_chat(usr,"<span class='warning'>Your [lowertext(host.vore_selected.name)] now has fullness overlay enabled.</span>") to_chat(user,"<span class='warning'>Your [lowertext(host.vore_selected.name)] now has fullness overlay enabled.</span>") //ChompEDIT - user, not usr
else else
host.vore_selected.mush_overlay = 0 host.vore_selected.mush_overlay = 0
to_chat(usr,"<span class='warning'>Your [lowertext(host.vore_selected.name)] no longer has fullness overlay enabled.</span>") to_chat(user,"<span class='warning'>Your [lowertext(host.vore_selected.name)] no longer has fullness overlay enabled.</span>") //ChompEDIT - user, not usr
host.vore_selected.update_internal_overlay() host.vore_selected.update_internal_overlay()
. = TRUE . = TRUE
if("b_mush_color") if("b_mush_color")
var/newcolor = input(usr, "Choose custom color for mush overlay.", "", host.vore_selected.mush_color) as color|null var/newcolor = input(user, "Choose custom color for mush overlay.", "", host.vore_selected.mush_color) as color|null //ChompEDIT - user, not usr
if(newcolor) if(newcolor)
host.vore_selected.mush_color = newcolor host.vore_selected.mush_color = newcolor
host.vore_selected.update_internal_overlay() host.vore_selected.update_internal_overlay()
. = TRUE . = TRUE
if("b_mush_alpha") if("b_mush_alpha")
var/newalpha = tgui_input_number(usr, "Set alpha transparency between 0-255", "Mush Alpha",255,255) var/newalpha = tgui_input_number(user, "Set alpha transparency between 0-255", "Mush Alpha",255,255) //ChompEDIT - user, not usr
if(newalpha != null) if(newalpha != null)
host.vore_selected.mush_alpha = newalpha host.vore_selected.mush_alpha = newalpha
host.vore_selected.update_internal_overlay() host.vore_selected.update_internal_overlay()
@@ -3812,10 +3812,10 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
if("b_metabolism_overlay") if("b_metabolism_overlay")
if(!host.vore_selected.metabolism_overlay) if(!host.vore_selected.metabolism_overlay)
host.vore_selected.metabolism_overlay = 1 host.vore_selected.metabolism_overlay = 1
to_chat(usr,"<span class='warning'>Your [lowertext(host.vore_selected.name)] now has ingested metabolism overlay enabled.</span>") to_chat(user,"<span class='warning'>Your [lowertext(host.vore_selected.name)] now has ingested metabolism overlay enabled.</span>") //ChompEDIT - user, not usr
else else
host.vore_selected.metabolism_overlay = 0 host.vore_selected.metabolism_overlay = 0
to_chat(usr,"<span class='warning'>Your [lowertext(host.vore_selected.name)] no longer has ingested metabolism overlay enabled.</span>") to_chat(user,"<span class='warning'>Your [lowertext(host.vore_selected.name)] no longer has ingested metabolism overlay enabled.</span>") //ChompEDIT - user, not usr
host.vore_selected.update_internal_overlay() host.vore_selected.update_internal_overlay()
. = TRUE . = TRUE
if("b_metabolism_mush_ratio") if("b_metabolism_mush_ratio")
@@ -3835,7 +3835,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.vore_selected.update_internal_overlay() host.vore_selected.update_internal_overlay()
. = TRUE . = TRUE
if("b_custom_ingested_color") if("b_custom_ingested_color")
var/newcolor = input(usr, "Choose custom color for ingested metabolism overlay. Cancel for reagent-based dynamic blend.", "", host.vore_selected.custom_ingested_color) as color|null var/newcolor = input(user, "Choose custom color for ingested metabolism overlay. Cancel for reagent-based dynamic blend.", "", host.vore_selected.custom_ingested_color) as color|null //ChompEDIT - user, not usr
if(newcolor) if(newcolor)
host.vore_selected.custom_ingested_color = newcolor host.vore_selected.custom_ingested_color = newcolor
else else
@@ -3843,7 +3843,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.vore_selected.update_internal_overlay() host.vore_selected.update_internal_overlay()
. = TRUE . = TRUE
if("b_custom_ingested_alpha") if("b_custom_ingested_alpha")
var/newalpha = tgui_input_number(usr, "Set alpha transparency between 0-255 when not using mush overlay option.", "Custom Ingested Alpha",255,255) var/newalpha = tgui_input_number(user, "Set alpha transparency between 0-255 when not using mush overlay option.", "Custom Ingested Alpha",255,255) //ChompEDIT - user, not usr
if(newalpha != null) if(newalpha != null)
host.vore_selected.custom_ingested_alpha = newalpha host.vore_selected.custom_ingested_alpha = newalpha
host.vore_selected.update_internal_overlay() host.vore_selected.update_internal_overlay()
@@ -3868,10 +3868,10 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
if("b_show_liq_fullness") if("b_show_liq_fullness")
if(!host.vore_selected.show_fullness_messages) if(!host.vore_selected.show_fullness_messages)
host.vore_selected.show_fullness_messages = 1 host.vore_selected.show_fullness_messages = 1
to_chat(usr,"<span class='warning'>Your [lowertext(host.vore_selected.name)] now has liquid examination options.</span>") to_chat(user,"<span class='warning'>Your [lowertext(host.vore_selected.name)] now has liquid examination options.</span>") //ChompEDIT - user, not usr
else else
host.vore_selected.show_fullness_messages = 0 host.vore_selected.show_fullness_messages = 0
to_chat(usr,"<span class='warning'>Your [lowertext(host.vore_selected.name)] no longer has liquid examination options.</span>") to_chat(user,"<span class='warning'>Your [lowertext(host.vore_selected.name)] no longer has liquid examination options.</span>") //ChompEDIT - user, not usr
. = TRUE . = TRUE
if("b_liq_msg_toggle1") if("b_liq_msg_toggle1")
host.vore_selected.liquid_fullness1_messages = !host.vore_selected.liquid_fullness1_messages host.vore_selected.liquid_fullness1_messages = !host.vore_selected.liquid_fullness1_messages

36
modular_chomp/code/modules/mob/living/living.dm
View File

@@ -192,38 +192,40 @@ Maybe later, gotta figure out a way to click yourself when in a locker etc.
if(size_multiplier != 1 || icon_scale_x != 1 && center_offset > 0) if(size_multiplier != 1 || icon_scale_x != 1 && center_offset > 0)
update_transform(TRUE) update_transform(TRUE)
/mob/living/proc/set_metainfo_favs(var/reopen = TRUE) //ChompEDIT START - Removal of usr
if(usr != src) /mob/living/proc/set_metainfo_favs(var/mob/user, var/reopen = TRUE)
if(user != src)
return return
var/new_metadata = strip_html_simple(tgui_input_text(usr, "Enter any information you'd like others to see relating to your FAVOURITE roleplay preferences. This will not be saved permanently unless you click save in the OOC notes panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(ooc_notes_favs), multiline = TRUE, prevent_enter = TRUE)) var/new_metadata = strip_html_simple(tgui_input_text(user, "Enter any information you'd like others to see relating to your FAVOURITE roleplay preferences. This will not be saved permanently unless you click save in the OOC notes panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(ooc_notes_favs), multiline = TRUE, prevent_enter = TRUE))
if(new_metadata && CanUseTopic(usr)) if(new_metadata && CanUseTopic(user))
if(new_metadata == "!clear") if(new_metadata == "!clear")
new_metadata = "" new_metadata = ""
ooc_notes_favs = new_metadata ooc_notes_favs = new_metadata
client.prefs.metadata_favs = new_metadata client.prefs.metadata_favs = new_metadata
to_chat(usr, "<span class='filter_notice'>OOC note favs have been updated. Don't forget to save!</span>") to_chat(user, "<span class='filter_notice'>OOC note favs have been updated. Don't forget to save!</span>")
log_admin("[key_name(usr)] updated their OOC note favs mid-round.") log_admin("[key_name(user)] updated their OOC note favs mid-round.")
if(reopen) if(reopen)
ooc_notes_window(usr) ooc_notes_window(user)
/mob/living/proc/set_metainfo_maybes(var/reopen = TRUE) /mob/living/proc/set_metainfo_maybes(var/mob/user, var/reopen = TRUE)
if(usr != src) if(user != src)
return return
var/new_metadata = strip_html_simple(tgui_input_text(usr, "Enter any information you'd like others to see relating to your MAYBE roleplay preferences. This will not be saved permanently unless you click save in the OOC notes panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(ooc_notes_maybes), multiline = TRUE, prevent_enter = TRUE)) var/new_metadata = strip_html_simple(tgui_input_text(user, "Enter any information you'd like others to see relating to your MAYBE roleplay preferences. This will not be saved permanently unless you click save in the OOC notes panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(ooc_notes_maybes), multiline = TRUE, prevent_enter = TRUE))
if(new_metadata && CanUseTopic(usr)) if(new_metadata && CanUseTopic(user))
if(new_metadata == "!clear") if(new_metadata == "!clear")
new_metadata = "" new_metadata = ""
ooc_notes_maybes = new_metadata ooc_notes_maybes = new_metadata
client.prefs.metadata_maybes = new_metadata client.prefs.metadata_maybes = new_metadata
to_chat(usr, "<span class='filter_notice'>OOC note maybes have been updated. Don't forget to save!</span>") to_chat(user, "<span class='filter_notice'>OOC note maybes have been updated. Don't forget to save!</span>")
log_admin("[key_name(usr)] updated their OOC note maybes mid-round.") log_admin("[key_name(user)] updated their OOC note maybes mid-round.")
if(reopen) if(reopen)
ooc_notes_window(usr) ooc_notes_window(user)
/mob/living/proc/set_metainfo_ooc_style(var/reopen = TRUE) /mob/living/proc/set_metainfo_ooc_style(var/mob/user, var/reopen = TRUE)
if(usr != src) if(user != src)
return return
ooc_notes_style = !ooc_notes_style ooc_notes_style = !ooc_notes_style
client.prefs.matadata_ooc_style = !client.prefs.matadata_ooc_style client.prefs.matadata_ooc_style = !client.prefs.matadata_ooc_style
if(reopen) if(reopen)
ooc_notes_window(usr) ooc_notes_window(user)
//ChompEDIT END - Removal of usr