diff --git a/code/game/objects/items/weapons/id cards/id_stacks.dm b/code/game/objects/items/weapons/id cards/id_stacks.dm index 0b5736c3939..914caaf0a0b 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks.dm @@ -320,7 +320,7 @@ UnregisterSignal(src, COMSIG_OBSERVER_MOVED) R = null last_robot_loc = null - ..() + . = ..() //Talon diff --git a/code/modules/client/preference_setup/vore/02_size.dm b/code/modules/client/preference_setup/vore/02_size.dm index cbe0c9ded00..fe72a73b0b2 100644 --- a/code/modules/client/preference_setup/vore/02_size.dm +++ b/code/modules/client/preference_setup/vore/02_size.dm @@ -111,9 +111,9 @@ else if(href_list["weight"]) var/new_weight = tgui_input_number(user, "Choose your character's relative body weight.\n\ - This measurement should be set relative to a normal 5'10'' person's body and not the actual size of your character.\n\ - If you set your weight to 500 because you're a naga or have metal implants then complain that you're a blob I\n\ - swear to god I will find you and I will punch you for not reading these directions!\n\ + Note: Scifi characters come in all shapes and sizes in this game, and not all follow the traditional shape of a human. Like a naga or a taur or a giant will weigh a\n\ + lot more than what this allows, or a micro will weigh a lot less. Just ignore all of that for a second and PRETEND the weight you're setting is visually for an \n\ + average human. This is the best solution we have at the moment.!\n\ ([WEIGHT_MIN]-[WEIGHT_MAX])", "Character Preference", null, WEIGHT_MAX, WEIGHT_MIN, round_value=FALSE) if(new_weight) var/unit_of_measurement = tgui_alert(user, "Is that number in pounds (lb) or kilograms (kg)?", "Confirmation", list("Pounds", "Kilograms")) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index d250ec97aa9..77931ad1414 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -543,7 +543,7 @@ s.undo_prey_takeover(TRUE) return var/obj/belly/B = loc - var/confirm = tgui_alert(src, "You're in a mob. Don't use this as a trick to get out of hostile animals. This is for escaping from preference-breaking and if you're otherwise unable to escape from endo (pred AFK for a long time).", "Confirmation", list("Okay", "Cancel")) + var/confirm = tgui_alert(src, "Please feel free to use this button at any time you are uncomfortable and in a belly. Consent is important.", "Confirmation", list("Okay", "Cancel")) if(confirm != "Okay" || loc != B) return //Actual escaping