From dd3cff98ae7255d35e19f41475933c1bd89df176 Mon Sep 17 00:00:00 2001
From: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date: Thu, 9 Sep 2021 17:20:13 -0500
Subject: [PATCH] Change "abiotic items" message to be more clear (#16545)
* Change "abiotic items" message to be more clear
* Add missing period.
---
code/game/dna/dna_modifier.dm | 6 +++---
code/game/machinery/Sleeper.dm | 2 +-
code/game/machinery/adv_med.dm | 4 ++--
.../atmospherics/machinery/components/unary_devices/cryo.dm | 4 ++--
code/modules/food_and_drinks/kitchen_machinery/gibber.dm | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index 7e9b6c34634..5d1bb0c98b0 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -156,7 +156,7 @@
to_chat(usr, "[src] is already occupied!")
return
if(usr.abiotic())
- to_chat(usr, "Subject cannot have abiotic items on.")
+ to_chat(usr, "Subject may not hold anything in their hands.")
return
if(usr.has_buckled_mobs()) //mob attached to us
to_chat(usr, "[usr] will not fit into [src] because [usr.p_they()] [usr.p_have()] a slime latched onto [usr.p_their()] head.")
@@ -194,7 +194,7 @@
if(!istype(L) || L.buckled)
return
if(L.abiotic())
- to_chat(user, "Subject cannot have abiotic items on.")
+ to_chat(user, "Subject may not hold anything in their hands.")
return
if(L.has_buckled_mobs()) //mob attached to us
to_chat(user, "[L] will not fit into [src] because [L.p_they()] [L.p_have()] a slime latched onto [L.p_their()] head.")
@@ -232,7 +232,7 @@
to_chat(user, "The scanner is already occupied!")
return
if(G.affecting.abiotic())
- to_chat(user, "Subject cannot have abiotic items on.")
+ to_chat(user, "Subject may not hold anything in their hands.")
return
if(G.affecting.has_buckled_mobs()) //mob attached to us
to_chat(user, "[G] will not fit into [src] because [G.affecting.p_they()] [G.affecting.p_have()] a slime latched onto [G.affecting.p_their()] head.")
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 57062a6e806..1272a667baa 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -512,7 +512,7 @@
if(!istype(L) || L.buckled)
return
if(L.abiotic())
- to_chat(user, "Subject cannot have abiotic items on.")
+ to_chat(user, "Subject may not hold anything in their hands.")
return
if(L.has_buckled_mobs()) //mob attached to us
to_chat(user, "[L] will not fit into [src] because [L.p_they()] [L.p_have()] a slime latched onto [L.p_their()] head.")
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 9b16d52383c..52857a071dc 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -67,7 +67,7 @@
return
var/mob/living/carbon/human/M = TYPECAST_YOUR_SHIT.affecting
if(M.abiotic())
- to_chat(user, "Subject cannot have abiotic items on.")
+ to_chat(user, "Subject may not hold anything in their hands.")
return
M.forceMove(src)
occupant = M
@@ -122,7 +122,7 @@
if(H.buckled)
return FALSE
if(H.abiotic())
- to_chat(user, "Subject cannot have abiotic items on.")
+ to_chat(user, "Subject may not hold anything in their hands.")
return FALSE
if(H.has_buckled_mobs()) //mob attached to us
to_chat(user, "[H] will not fit into [src] because [H.p_they()] [H.p_have()] a slime latched onto [H.p_their()] head.")
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 3943bde9a1d..8a5743da3d3 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -144,7 +144,7 @@
if(!istype(L) || L.buckled)
return
if(L.abiotic())
- to_chat(user, "Subject cannot have abiotic items on.")
+ to_chat(user, "Subject may not hold anything in their hands.")
return
if(L.has_buckled_mobs()) //mob attached to us
to_chat(user, "[L] will not fit into [src] because [L.p_they()] [L.p_have()] a slime latched onto [L.p_their()] head.")
@@ -462,7 +462,7 @@
to_chat(usr, "The cryo cell is already occupied!")
return
if(M.abiotic())
- to_chat(usr, "Subject may not have abiotic items on.")
+ to_chat(usr, "Subject may not hold anything in their hands.")
return
if(!node)
to_chat(usr, "The cell is not correctly connected to its pipe network!")
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index 4ec135e9e01..b2443b4d8a7 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -139,8 +139,8 @@
to_chat(user, "This is not suitable for [src]!")
return
- if(victim.abiotic(1))
- to_chat(user, "Subject may not have abiotic items on.")
+ if(victim.abiotic(TRUE))
+ to_chat(user, "Subject may not have anything on their body.")
return
user.visible_message("[user] starts to put [victim] into [src]!")