Merge pull request #14336 from VOREStation/upstream-merge-8870

[MIRROR] Repairing light robotic damage messaging fix
This commit is contained in:
Heroman3003
2023-01-19 13:20:04 +10:00
committed by GitHub
2 changed files with 9 additions and 8 deletions
+4 -3
View File
@@ -461,11 +461,12 @@
if("omni")src.heal_damage(repair_amount, repair_amount, 0, 1)
if(damage_desc)
var/fix_verb = (damage_amount > repair_amount) ? "patches" : "finishes patching"
if(user == src.owner)
var/datum/gender/T = gender_datums[user.get_visible_gender()]
user.visible_message("<b>\The [user]</b> patches [damage_desc] on [T.his] [src.name] with [tool].")
user.visible_message("<b>\The [user]</b> [fix_verb] [damage_desc] on [T.his] [src.name] with [tool].")
else
user.visible_message("<b>\The [user]</b> patches [damage_desc] on [owner]'s [src.name] with [tool].")
user.visible_message("<b>\The [user]</b> [fix_verb] [damage_desc] on [owner]'s [src.name] with [tool].")
return 1
@@ -1416,4 +1417,4 @@ Note that amputating the affected organ does in fact remove the infection from t
for(var/M in markings)
var/datum/sprite_accessory/marking/mark = markings[M]["datum"]
if(mark.hide_body_parts && (organ_tag in mark.hide_body_parts))
return 1
return 1