diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index dbd6a391bad..ba67b8a706a 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -447,7 +447,7 @@
if(target.wear_mask && !target.wear_mask.canremove)
message = "\red [source] fails to take off \a [target.wear_mask] from [target]'s head!"
return
- else
+ else if(target.wear_mask)
message = "\red [source] is trying to take off \a [target.wear_mask] from [target]'s head!"
if("l_hand")
target.attack_log += text("\[[time_stamp()]\] Has had their left hand item ([target.l_hand]) removed by [source.name] ([source.ckey])")
@@ -463,7 +463,7 @@
if(target.gloves && !target.gloves.canremove)
message = "\red [source] fails to take off \a [target.gloves] from [target]'s hands!"
return
- else
+ else if(target.gloves)
message = "\red [source] is trying to take off the [target.gloves] from [target]'s hands!"
if("eyes")
target.attack_log += text("\[[time_stamp()]\] Has had their eyewear ([target.glasses]) removed by [source.name] ([source.ckey])")
@@ -471,7 +471,7 @@
if(target.glasses && !target.glasses.canremove)
message = "\red [source] fails to take off \a [target.glasses] from [target]'s eyes!"
return
- else
+ else if(target.glasses)
message = "\red [source] is trying to take off the [target.glasses] from [target]'s eyes!"
if("l_ear")
target.attack_log += text("\[[time_stamp()]\] Has had their left ear item ([target.l_ear]) removed by [source.name] ([source.ckey])")
@@ -479,7 +479,7 @@
if(target.l_ear && !target.l_ear.canremove)
message = "\red [source] fails to take off \a [target.l_ear] from [target]'s left ear!"
return
- else
+ else if(target.l_ear)
message = "\red [source] is trying to take off the [target.l_ear] from [target]'s left ear!"
if("r_ear")
target.attack_log += text("\[[time_stamp()]\] Has had their right ear item ([target.r_ear]) removed by [source.name] ([source.ckey])")
@@ -487,7 +487,7 @@
if(target.r_ear && !target.r_ear.canremove)
message = "\red [source] fails to take off \a [target.r_ear] from [target]'s right ear!"
return
- else
+ else if(target.r_ear)
message = "\red [source] is trying to take off the [target.r_ear] from [target]'s right ear!"
if("head")
target.attack_log += text("\[[time_stamp()]\] Has had their hat ([target.head]) removed by [source.name] ([source.ckey])")
@@ -495,7 +495,7 @@
if(target.head && !target.head.canremove)
message = "\red [source] fails to take off \a [target.head] from [target]'s head!"
return
- else
+ else if(target.head)
message = "\red [source] is trying to take off the [target.head] from [target]'s head!"
if("shoes")
target.attack_log += text("\[[time_stamp()]\] Has had their shoes ([target.shoes]) removed by [source.name] ([source.ckey])")
@@ -503,22 +503,20 @@
if(target.shoes && !target.shoes.canremove)
message = "\red [source] fails to take off \a [target.shoes] from [target]'s feet!"
return
- else
- message = "\red [source] is trying to take off the [target.shoes] from [target]'s feet!"
+ else if(target.shoes)
+ message = "\red [source] is trying to take off [target.shoes] from [target]'s feet!"
if("belt")
target.attack_log += text("\[[time_stamp()]\] Has had their belt item ([target.belt]) removed by [source.name] ([source.ckey])")
source.attack_log += text("\[[time_stamp()]\] Attempted to remove [target.name]'s ([target.ckey]) belt item ([target.belt])")
- if(!pickpocket)
- message = "\red [source] is trying to take off the [target.belt] from [target]'s belt!"
- else
- source << "\blue You try to take off the [target.belt] from [target]'s belt!"
+ if(!pickpocket && target.belt)
+ message = "\red [source] is trying to take off \a [target.belt] from [target]'s belt!"
if("suit")
target.attack_log += text("\[[time_stamp()]\] Has had their suit ([target.wear_suit]) removed by [source.name] ([source.ckey])")
source.attack_log += text("\[[time_stamp()]\] Attempted to remove [target.name]'s ([target.ckey]) suit ([target.wear_suit])")
if(target.wear_suit && !target.wear_suit.canremove)
message = "\red [source] fails to take off \a [target.wear_suit] from [target]'s body!"
return
- else
+ else if(target.wear_suit)
message = "\red [source] is trying to take off \a [target.wear_suit] from [target]'s body!"
if("back")
target.attack_log += text("\[[time_stamp()]\] Has had their back item ([target.back]) removed by [source.name] ([source.ckey])")
@@ -529,8 +527,6 @@
source.attack_log += text("\[[time_stamp()]\] Attempted to unhandcuff [target.name]'s ([target.ckey])")
if(target.handcuffed)
message = "\red [source] is trying to unhandcuff [target]!"
- else
- message = "\red [source] is trying to handcuff [target]!"
if("legcuff")
target.attack_log += text("\[[time_stamp()]\] Was unlegcuffed by [source.name] ([source.ckey])")
source.attack_log += text("\[[time_stamp()]\] Attempted to unlegcuff [target.name]'s ([target.ckey])")
@@ -559,7 +555,7 @@
for(var/obj/item/I in list(target.l_store, target.r_store))
if(I.on_found(source))
return
- message = "\red [source] is trying to empty [target]'s pockets."
+ message = "\red [source] is trying to empty [target]'s pockets!"
if("CPR")
if (!target.cpr_time)
del(src)
@@ -576,15 +572,19 @@
target.attack_log += text("\[[time_stamp()]\] Has had their internals toggled by [source.name] ([source.ckey])")
source.attack_log += text("\[[time_stamp()]\] Attempted to toggle [target.name]'s ([target.ckey]) internals")
if (target.internal)
- message = "\red [source] is trying to remove [target]'s internals"
+ message = "\red [source] is trying to remove [target]'s internals!"
else
message = "\red [source] is trying to set on [target]'s internals."
if("splints")
- message = text("\red [] is trying to remove []'s splints!", source, target)
+ message = "\red [source] is trying to remove [target]'s splints!"
for(var/mob/M in viewers(target, null))
- if(findtext(message, "is trying to take off from", 1, 0) > 0)
- M.show_message("\red [source] is trying to put \a [item] on [target]", 1)
+ if(findtext(message, "is trying to take off from", 1, 0) > 0 || message == null)
+ message = "\red [source] is trying to put \a [item] on [target]!"
+ if(findtext(message, "is trying to put on", 1, 0) > 0)
+ return
+ else
+ M.show_message(message, 1)
else
M.show_message(message, 1)
spawn( HUMAN_STRIP_DELAY )