cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 21:49:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update organ_external.dm

Browse Source
This commit is contained in:
Heroman3003
2023-01-19 12:34:49 +10:00
committed by GitHub
parent ec2ea599ed
commit 8dbad98871
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_external.dm
+3 -9
View File
@@ -464,15 +464,9 @@
var/fix_verb = (damage_amount > repair_amount) ? "patches" : "finishes patching"
if(user == src.owner)
var/datum/gender/T = gender_datums[user.get_visible_gender()]
<<<<<<< HEAD
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("<span class='notice'>\The [user] [fix_verb] [damage_desc] on [T.his] [src.name] with [tool].</span>")
else
user.visible_message("<span class='notice'>\The [user] [fix_verb] [damage_desc] on [owner]'s [src.name] with [tool].</span>")
>>>>>>> 02c3aebf2a3... Repairing light robotic damage messaging fix (#8870)
user.visible_message("<b>\The [user]</b> [fix_verb] [damage_desc] on [owner]'s [src.name] with [tool].")
return 1
@@ -1423,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