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

Merge pull request #2566 from Robertha89/master

Browse Source 
Fixes invisible wrapping paper, sonic jackhammer not breaking walls and field surgery kit not fitting its own content
This commit is contained in:
Fox McCloud
2015-11-18 21:26:23 -05:00
parent 0e2e27d78d b774e54a4d
commit 8c1f11fb0b
6 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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 disintegrates 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 disintegrates the reinforced plating.</span>"
dismantle_wall()
//REPAIRING