cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 08:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Sonic Jackhammer

Browse Source
This commit is contained in:
Robertha89
2015-11-15 21:53:21 +01:00
parent f9af83f20f
commit 3936231e53
4 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/false_walls.dm
+2 -2
View File
@@ -120,7 +120,7 @@
else
user << "<span class='warning'>You can't reach, close it first!</span>"
if(istype(W, /obj/item/weapon/gun/energy/plasmacutter) || istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill) || istype(W, /obj/item/weapon/melee/energy/blade))
if(istype(W, /obj/item/weapon/gun/energy/plasmacutter) || istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill) || istype(W, /obj/item/weapon/pickaxe/drill/jackhammer) || istype(W, /obj/item/weapon/melee/energy/blade))
dismantle(user)
/obj/structure/falsewall/proc/dismantle(mob/user)
@@ -221,7 +221,7 @@
icon_state = ""
mineral = "plasma"
walltype = "plasma"
/obj/structure/falsewall/plasma/attackby(obj/item/weapon/W, mob/user, params)
if(is_hot(W) > 300)
message_admins("Plasma falsewall ignited by [key_name_admin(user)] in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
code/game/objects/structures/girders.dm
+6
View File
@@ -37,6 +37,12 @@
new /obj/item/stack/sheet/metal(get_turf(src))
qdel(src)
else if(istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill))
playsound(src.loc, 'sound/weapons/sonic_jackhammer.ogg', 100, 1)
user << "\blue You disintegrate the girder!"
new /obj/item/stack/sheet/metal(get_turf(src))
qdel(src)
else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 && istype(src,/obj/structure/girder/reinforced))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
user << "\blue Now unsecuring support struts"
code/game/turfs/simulated/walls.dm
+9
View File
@@ -385,6 +385,15 @@
dismantle_wall()
visible_message("<span class='warning'>[user] drills through \the [src]!</span>","<span class='warning'>You hear the grinding of metal.</span>")
else if (istype(W, /obj/item/weapon/pickaxe/drill/jackhammer))
user << "<span class='notice'>You begin to disintegrate the wall.</span>"
if(do_after(user, mineral == "diamond" ? 60 : 30, target = src))
user << "<span class='notice'>Your jackhammer disintegrate the reinforced plating.</span>"
dismantle_wall()
visible_message("<span class='warning'>[user] disintegrates \the [src]!</span>","<span class='warning'>You hear the grinding of metal.</span>")
else if(istype(W, /obj/item/weapon/melee/energy/blade))
var/obj/item/weapon/melee/energy/blade/EB = W
code/game/turfs/simulated/walls_reinforced.dm
+8 -1
View File
@@ -202,7 +202,14 @@
user << "<span class='notice'>You begin to drill though the wall.</span>"
if(do_after(user, 200, target = src))
user << "<span class='notice'>Your drill tears though the last of the reinforced plating.</span>"
user << "<span class='notice'>Your drill tears through the last of the reinforced plating.</span>"
dismantle_wall()
if(istype(W,/obj/item/weapon/pickaxe/drill/jackhammer))
user << "<span class='notice'>You begin to disintegrate the wall.</span>"
if(do_after(user, 100, target = src))
user << "<span class='notice'>Your sonic jackhammer disintegrate the reinforced plating.</span>"
dismantle_wall()
//REPAIRING