cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 20:11:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into placeholder

Browse Source
This commit is contained in:
Ferner
2021-02-24 17:57:09 +01:00
parent e81dd21c21 dd6bee3a0c
commit e00819b926
66 changed files with 439 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/girders.dm
+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))
code/game/objects/structures/grille.dm
+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))