diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index 35c250abc32..180e5a55e64 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -122,12 +122,12 @@
icon_state = "too_much_oxy"
/obj/screen/alert/not_enough_nitro
- name = "Choking (No N)"
+ name = "Choking (No N2)"
desc = "You're not getting enough nitrogen. Find some good air before you pass out!"
icon_state = "not_enough_nitro"
/obj/screen/alert/too_much_nitro
- name = "Choking (N)"
+ name = "Choking (N2)"
desc = "There's too much nitrogen in the air, and you're breathing it in! Find some good air before you pass out!"
icon_state = "too_much_nitro"
diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm
index c86f988bcd4..4eb3adc62da 100644
--- a/code/controllers/subsystem/shuttles.dm
+++ b/code/controllers/subsystem/shuttles.dm
@@ -135,8 +135,6 @@ SUBSYSTEM_DEF(shuttle)
to_chat(user, "The emergency shuttle has been disabled by Centcom.")
return
- call_reason = trim(html_encode(call_reason))
-
if(length(call_reason) < CALL_SHUTTLE_REASON_LENGTH)
to_chat(user, "Reason is too short. [CALL_SHUTTLE_REASON_LENGTH] character minimum.")
return
diff --git a/code/datums/spells/mime.dm b/code/datums/spells/mime.dm
index 7142448dbdf..79c4e796aa1 100644
--- a/code/datums/spells/mime.dm
+++ b/code/datums/spells/mime.dm
@@ -21,7 +21,7 @@
if(!usr.mind.miming)
to_chat(usr, "You must dedicate yourself to silence first.")
return
- invocation = "[usr.real_name] looks as if a wall is in front of [usr.p_them()]."
+ invocation = "[usr.name] looks as if a wall is in front of [usr.p_them()]."
else
invocation_type ="none"
..()
@@ -86,7 +86,7 @@
if(!usr.mind.miming)
to_chat(usr, "You must dedicate yourself to silence first.")
return
- invocation = "[usr.real_name] looks as if a blockade is in front of [usr.p_them()]."
+ invocation = "[usr.name] looks as if a blockade is in front of [usr.p_them()]."
else
invocation_type ="none"
..()
diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm
index 6c116ab53f2..ff3a6152da1 100644
--- a/code/game/gamemodes/vampire/vampire.dm
+++ b/code/game/gamemodes/vampire/vampire.dm
@@ -290,7 +290,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
draining = null
return
add_attack_logs(owner, H, "vampirebit & is draining their blood.", ATKLOG_ALMOSTALL)
- owner.visible_message("[owner] grabs [H]'s neck harshly and sinks in [owner.p_their()] fangs!", "You sink your fangs into [H] and begin to drain [owner.p_their()] blood.", "You hear a soft puncture and a wet sucking noise.")
+ owner.visible_message("[owner] grabs [H]'s neck harshly and sinks in [owner.p_their()] fangs!", "You sink your fangs into [H] and begin to drain [H.p_their()] blood.", "You hear a soft puncture and a wet sucking noise.")
if(!iscarbon(owner))
H.LAssailant = null
else
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 054a6719aff..46da580a0d1 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -147,7 +147,7 @@
message_cooldown = world.time + 600 //One minute
if("callshuttle")
- var/input = clean_input("Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","")
+ var/input = input("Please enter the reason for calling the shuttle.", "Shuttle Call Reason.") as null|message
if(!input || ..() || !is_authenticated(usr))
return
call_shuttle_proc(usr, input)
@@ -410,7 +410,7 @@
else
menu_state=value
-/proc/call_shuttle_proc(mob/user, reason)
+/proc/call_shuttle_proc(mob/user, reason, sanitized = FALSE)
if(GLOB.sent_strike_team == 1)
to_chat(user, "Central Command will not allow the shuttle to be called. Consider all contracts terminated.")
return
@@ -427,6 +427,9 @@
to_chat(user, "Under directive 7-10, [station_name()] is quarantined until further notice.")
return
+ if(!sanitized)
+ reason = trim_strip_html_properly(reason, allow_lines = TRUE)
+
SSshuttle.requestEvac(user, reason)
log_game("[key_name(user)] has called the shuttle.")
message_admins("[key_name_admin(user)] has called the shuttle.", 1)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index 8c878cd6c59..5b2f0a54f24 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -69,7 +69,6 @@
togglelock(user)
/obj/structure/closet/secure_closet/AltClick(mob/user)
- ..()
if(Adjacent(user))
togglelock(user)
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index b0d9464a0a3..0e89ae82e75 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -397,7 +397,8 @@
return TRUE
/obj/structure/window/AltClick(mob/user)
-
+ if(fulltile) // Can't rotate these.
+ return ..()
if(user.incapacitated())
to_chat(user, "You can't do that right now!")
return
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index d07b95d18eb..2f3fcca395f 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -424,9 +424,9 @@
..()
/obj/item/clothing/glasses/thermal/monocle
- name = "thermoncle"
+ name = "thermonocle"
desc = "A thermal monocle."
- icon_state = "thermoncle"
+ icon_state = "thermonocle"
flags_cover = null //doesn't protect eyes because it's a monocle, duh
/obj/item/clothing/glasses/thermal/eyepatch
diff --git a/code/modules/karma/karma.dm b/code/modules/karma/karma.dm
index de8b42f04ae..7c80166c46f 100644
--- a/code/modules/karma/karma.dm
+++ b/code/modules/karma/karma.dm
@@ -127,11 +127,13 @@ GLOBAL_LIST_EMPTY(karma_spenders)
continue
if(M == src)
continue
+ if(M.get_preference(PREFTOGGLE_DISABLE_KARMA))
+ continue
if(!isobserver(src) && isNonCrewAntag(M))
continue // Don't include special roles for non-observers, because players use it to meta
karma_list += M
- if(!karma_list.len)
+ if(!length(karma_list))
to_chat(usr, "There's no-one to spend your karma on.")
return
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index c4e246f9d3f..65589260d66 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -93,7 +93,7 @@
for(var/P in GLOB.dead_mob_list)
var/mob/M = P
if((M.client?.prefs.toggles2 & PREFTOGGLE_2_DEATHMESSAGE) && (isobserver(M) || M.stat == DEAD))
- to_chat(M, "[mind.name] has died at [area_name]. (JMP)")
+ to_chat(M, "[mind.name] has died at [area_name]. (JMP)")
if(SSticker && SSticker.mode)
SSticker.mode.check_win()
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index eaf7261a7b0..d0407aa271e 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -539,7 +539,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
if(check_unable(AI_CHECK_WIRELESS))
return
- var/input = clean_input("Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","")
+ var/input = input("Please enter the reason for calling the shuttle.", "Shuttle Call Reason.") as null|message
if(!input || stat)
return
diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm
index aec8cf946d1..452023946ae 100644
--- a/code/modules/projectiles/guns/medbeam.dm
+++ b/code/modules/projectiles/guns/medbeam.dm
@@ -92,7 +92,7 @@
return 0
for(var/obj/effect/ebeam/medical/B in turf)// Don't cross the str-beams!
if(B.owner != current_beam)
- turf.visible_message("The medbeams cross and EXPLODE!")
+ turf.visible_message("The medbeams cross and EXPLODE!")
explosion(B.loc,0,3,5,8)
qdel(dummy)
return 0
diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index b2d5f08f47b..07fc7f4ef9e 100644
Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ
diff --git a/icons/mob/species/grey/eyes.dmi b/icons/mob/species/grey/eyes.dmi
index ec6444b0aa4..7e0c0c9dc8c 100644
Binary files a/icons/mob/species/grey/eyes.dmi and b/icons/mob/species/grey/eyes.dmi differ
diff --git a/icons/mob/species/vox/eyes.dmi b/icons/mob/species/vox/eyes.dmi
index 3beffab6d9b..8bf2772bff8 100644
Binary files a/icons/mob/species/vox/eyes.dmi and b/icons/mob/species/vox/eyes.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index 14ad340a547..68465a79014 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ