cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5564 from CHOMPStation2/upstream-merge-14336

Browse Source 
[MIRROR] [MIRROR] Repairing light robotic damage messaging fix
This commit is contained in:
Nadyr
2023-01-27 10:11:46 -05:00
committed by GitHub
parent 55034ed973 7d25e70249
commit 57ae8c01ee
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/objects/items/weapons/tools/weldingtool.dm
View File

@@ -79,21 +79,21 @@
if(S.organ_tag == BP_HEAD)
if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space))
to_chat(user, "<span class='warning'>You can't apply [src] through [H.head]!</span>")
return 1
return TRUE
else
if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space))
to_chat(user, "<span class='warning'>You can't apply [src] through [H.wear_suit]!</span>")
return 1
return TRUE
if(!welding)
to_chat(user, "<span class='warning'>You'll need to turn [src] on to patch the damage on [H]'s [S.name]!</span>")
return 1
return TRUE
if(S.robo_repair(15, BRUTE, "some dents", src, user))
remove_fuel(1, user)
return 1
return TRUE
else
return 1 //Stops you from accidentally harming someone while on help intent.
return TRUE //Stops you from accidentally harming someone while on help intent.
return ..()

5
code/modules/organs/organ_external.dm
View File

@@ -462,11 +462,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