Jackhammer nerfs. This thing no longer destroys wall instantly. (#46019)

This commit is contained in:
nemvar
2019-08-23 16:45:31 -07:00
committed by Rob Bailey
parent ed9f3ec4f5
commit 6d7bccfca4
5 changed files with 2 additions and 52 deletions
@@ -110,9 +110,6 @@
else if(W.tool_behaviour == TOOL_WELDER)
if(W.use_tool(src, user, 0, volume=50))
dismantle(user, TRUE)
else if(istype(W, /obj/item/pickaxe/drill/jackhammer))
W.play_tool_sound(src)
dismantle(user, TRUE)
else
return ..()
-21
View File
@@ -37,13 +37,6 @@
M.add_fingerprint(user)
qdel(src)
else if(istype(W, /obj/item/pickaxe/drill/jackhammer))
to_chat(user, "<span class='notice'>You smash through the girder!</span>")
new /obj/item/stack/sheet/metal(get_turf(src))
W.play_tool_sound(src)
qdel(src)
else if(istype(W, /obj/item/stack))
if(iswallturf(loc))
to_chat(user, "<span class='warning'>There is already a wall present!</span>")
@@ -354,13 +347,6 @@
transfer_fingerprints_to(R)
qdel(src)
else if(istype(W, /obj/item/pickaxe/drill/jackhammer))
to_chat(user, "<span class='notice'>Your jackhammer smashes through the girder!</span>")
var/obj/item/stack/sheet/runed_metal/R = new(drop_location(), 2)
transfer_fingerprints_to(R)
W.play_tool_sound(src)
qdel(src)
else if(istype(W, /obj/item/stack/sheet/runed_metal))
var/obj/item/stack/sheet/runed_metal/R = W
if(R.get_amount() < 1)
@@ -428,13 +414,6 @@
transfer_fingerprints_to(B)
qdel(src)
else if(istype(W, /obj/item/pickaxe/drill/jackhammer))
to_chat(user, "<span class='notice'>Your jackhammer smashes through the girder!</span>")
var/obj/item/stack/tile/bronze/B = new(drop_location(), 2)
transfer_fingerprints_to(B)
W.play_tool_sound(src)
qdel(src)
else if(istype(W, /obj/item/stack/tile/bronze))
var/obj/item/stack/tile/bronze/B = W
if(B.get_amount() < 2)
@@ -47,18 +47,6 @@
playsound(src, 'sound/effects/bang.ogg', 50, 1)
to_chat(M, "<span class='warning'>This wall is far too strong for you to destroy.</span>")
/turf/closed/wall/r_wall/try_destroy(obj/item/I, mob/user, turf/T)
if(istype(I, /obj/item/pickaxe/drill/jackhammer))
to_chat(user, "<span class='notice'>You begin to smash though [src]...</span>")
if(do_after(user, 50, target = src))
if(!istype(src, /turf/closed/wall/r_wall))
return TRUE
I.play_tool_sound(src)
visible_message("<span class='warning'>[user] smashes through [src] with [I]!</span>", "<span class='italics'>You hear the grinding of metal.</span>")
dismantle_wall()
return TRUE
return FALSE
/turf/closed/wall/r_wall/try_decon(obj/item/W, mob/user, turf/T)
//DECONSTRUCTION
switch(d_state)
+1 -15
View File
@@ -174,7 +174,7 @@
var/turf/T = user.loc //get user's location for delay checks
//the istype cascade has been spread among various procs for easy overriding
if(try_clean(W, user, T) || try_wallmount(W, user, T) || try_decon(W, user, T) || try_destroy(W, user, T))
if(try_clean(W, user, T) || try_wallmount(W, user, T) || try_decon(W, user, T))
return
return ..()
@@ -225,20 +225,6 @@
return FALSE
/turf/closed/wall/proc/try_destroy(obj/item/I, mob/user, turf/T)
if(istype(I, /obj/item/pickaxe/drill/jackhammer))
if(!iswallturf(src))
return TRUE
if(user.loc == T)
I.play_tool_sound(src)
dismantle_wall()
user.visible_message("<span class='warning'>[user] smashes through [src] with [I]!</span>", \
"<span class='warning'>You smash through [src] with [I]!</span>", \
"<span class='italics'>You hear the grinding of metal.</span>")
return TRUE
return FALSE
/turf/closed/wall/singularity_pull(S, current_size)
..()
wall_singularity_pull(current_size)
@@ -84,7 +84,7 @@
name = "sonic jackhammer"
icon_state = "jackhammer"
item_state = "jackhammer"
toolspeed = 0.1 //the epitome of powertools. extremely fast mining, laughs at puny walls
toolspeed = 0.1 //the epitome of powertools. extremely fast mining
w_class = WEIGHT_CLASS_HUGE //the epitome of power(gamer)tools is CHUNCKY
usesound = 'sound/weapons/sonic_jackhammer.ogg'
hitsound = 'sound/weapons/sonic_jackhammer.ogg'