mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-30 16:38:22 +01:00
Bugfixes: Welding tool, Constructs, Runes (#1072)
Fixes #1066 Fixes #1065 Fixes #1053
This commit is contained in:
@@ -456,16 +456,20 @@
|
||||
user << "<span class='warning'>You lack the reach to be able to repair yourself.</span>"
|
||||
return
|
||||
|
||||
if (!getBruteLoss())
|
||||
if (getBruteLoss() == 0)
|
||||
user << "Nothing to fix here!"
|
||||
return
|
||||
var/obj/item/weapon/weldingtool/WT = W
|
||||
if (!WT.welding)
|
||||
// Welding tool is switched off
|
||||
user << "<span class='warning'>You need to light the welding tool, first!</span>"
|
||||
return
|
||||
if (WT.remove_fuel(0))
|
||||
adjustBruteLoss(-30)
|
||||
updatehealth()
|
||||
add_fingerprint(user)
|
||||
for(var/mob/O in viewers(user, null))
|
||||
O.show_message(text("\red [user] has fixed some of the dents on [src]!"), 1)
|
||||
O.show_message(text("<span class='warning'>[user] has fixed some of the dents on [src]!</span>"), 1)
|
||||
else
|
||||
user << "Need more welding fuel!"
|
||||
return
|
||||
|
||||
@@ -57,11 +57,14 @@
|
||||
|
||||
/mob/living/simple_animal/construct/attack_generic(var/mob/user)
|
||||
if(istype(user, /mob/living/simple_animal/construct/builder))
|
||||
if(health < maxHealth)
|
||||
if(getBruteLoss() > 0)
|
||||
adjustBruteLoss(-5)
|
||||
user.visible_message("<span class='notice'>\The [user]</b> mends some of \the [src]'s wounds.</span>")
|
||||
else
|
||||
user << "<span class='notice'>\The [src] is undamaged.</span>"
|
||||
if (health < maxHealth)
|
||||
user << "<span class='notice'>Healing \the [src] any further is beyond your abilities.</span>"
|
||||
else
|
||||
user << "<span class='notice'>\The [src] is undamaged.</span>"
|
||||
return
|
||||
return ..()
|
||||
|
||||
@@ -131,6 +134,16 @@
|
||||
|
||||
return (..(P))
|
||||
|
||||
/mob/living/simple_animal/construct/armoured/UnarmedAttack(var/atom/A, var/proximity)
|
||||
if(istype(A, /obj/machinery))
|
||||
// Destroy machines instead of opening their UI
|
||||
var/obj/machinery/M = A
|
||||
do_attack_animation(M)
|
||||
playsound(loc, attack_sound, 50, 1, 1)
|
||||
M.ex_act(3.0)
|
||||
else
|
||||
..()
|
||||
|
||||
|
||||
|
||||
////////////////////////Wraith/////////////////////////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user