Plasma Cutter Improvements (#11231)

This commit is contained in:
Geeves
2021-02-24 16:01:28 +01:00
committed by GitHub
parent ef8afc41e6
commit 824b47d91b
9 changed files with 67 additions and 19 deletions
+3
View File
@@ -875,3 +875,6 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
. += "Dismemberment: [edge ? "likely to dismember" : "unlikely to dismember"]<br>"
. += "Penetration: [armor_penetration]<br>"
. += "Throw Force: [throwforce]<br>"
/obj/item/proc/use_resource(var/mob/user, var/use_amount)
return
+4
View File
@@ -465,6 +465,10 @@
to_chat(M, SPAN_NOTICE("You need more welding fuel to complete this task."))
return 0
/obj/item/weldingtool/use_resource(mob/user, var/use_amount)
if(get_fuel() >= use_amount)
reagents.remove_reagent(/decl/reagent/fuel, use_amount)
//Returns whether or not the welding tool is currently on.
/obj/item/weldingtool/proc/isOn()
return src.welding
+8 -4
View File
@@ -87,10 +87,14 @@
reset_girder()
else if(istype(W, /obj/item/gun/energy/plasmacutter))
to_chat(user, "<span class='notice'>Now slicing apart the girder...</span>")
if(do_after(user,30/W.toolspeed))
if(!src) return
to_chat(user, "<span class='notice'>You slice apart the girder!</span>")
var/obj/item/gun/energy/plasmacutter/PC = W
to_chat(user, SPAN_NOTICE("You start lining up \the [PC] to the joints of \the [src]..."))
if(do_after(user, 2 SECONDS))
if(!src)
return
playsound(loc, PC.fire_sound, 100, 1)
to_chat(user, SPAN_NOTICE("You blast apart the girder!"))
W.use_resource(user, 1)
dismantle()
else if(istype(W, /obj/item/melee/energy))
+3 -3
View File
@@ -102,10 +102,10 @@
qdel(src)
else if(istype(W, /obj/item/gun/energy/plasmacutter))
var/obj/item/gun/energy/plasmacutter/PC = W
if(!PC.power_supply)
to_chat(user, SPAN_WARNING("\The [src] doesn't have a power supply installed!"))
if(PC.check_power_and_message(user))
return
playsound(get_turf(src), PC.fire_sound, 100, TRUE)
PC.use_resource(user, 1)
playsound(loc, PC.fire_sound, 100, TRUE)
new /obj/item/stack/rods(get_turf(src), destroyed ? 1 : 2)
qdel(src)
else if((W.isscrewdriver()) && (istype(loc, /turf/simulated) || anchored))