Skip to content

Commit

Permalink
Remove crowbarring sound on blast doors and update the proc (Paradise…
Browse files Browse the repository at this point in the history
…SS13#13282)

* Update pod door crowbarring

* remove crowbar volume on all door subtypes
  • Loading branch information
datlo authored May 18, 2020
1 parent 2b5b444 commit 052eef5
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion code/game/machinery/doors/door.dm
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
. = TRUE
if(operating)
return
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
if(!I.use_tool(src, user, 0, volume = 0))
return
try_to_crowbar(user, I)

Expand Down
13 changes: 11 additions & 2 deletions code/game/machinery/doors/poddoor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,18 @@
/obj/machinery/door/poddoor/try_to_activate_door(mob/user)
return

/obj/machinery/door/poddoor/try_to_crowbar(obj/item/I, mob/user)
/obj/machinery/door/poddoor/try_to_crowbar(mob/user, obj/item/I)
if(!density)
return
if(!hasPower())
open()
to_chat(user, "<span class='notice'>You start forcing [src] open...</span>")
if(do_after(user, 50 * I.toolspeed, target = src))
if(!hasPower())
open()
else
to_chat(user, "<span class='warning'>[src] resists your efforts to force it!</span>")
else
to_chat(user, "<span class='warning'>[src] resists your efforts to force it!</span>")

// Whoever wrote the old code for multi-tile spesspod doors needs to burn in hell. - Unknown
// Wise words. - Bxil
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/weapons/twohanded.dm
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@
slot_flags = SLOT_BACK
force_unwielded = 5
force_wielded = 24
toolspeed = 0.25
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
usesound = 'sound/items/crowbar.ogg'
Expand Down

0 comments on commit 052eef5

Please sign in to comment.