cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 22:47:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some doubling up of sounds on tools

Browse Source
This commit is contained in:
Citinited
2020-02-16 00:49:06 +00:00
parent fddff1049b
commit d342870bd8
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/door.dm
+2
View File
@@ -202,6 +202,8 @@
if(user.a_intent == INTENT_HARM)
return
. = TRUE
if(operating)
return
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
try_to_crowbar(I, user)
code/game/machinery/machinery.dm
+6 -3
View File
@@ -402,18 +402,19 @@ Class Procs:
/obj/machinery/proc/default_deconstruction_crowbar(user, obj/item/I, ignore_panel = 0)
if(I.tool_behaviour != TOOL_CROWBAR)
return FALSE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
if(!I.use_tool(src, user, 0, volume = 0))
return FALSE
if((panel_open || ignore_panel) && !(flags & NODECONSTRUCT))
deconstruct(TRUE)
to_chat(user, "<span class='notice'>You disassemble [src].</span>")
I.play_tool_sound(user, I.tool_volume)
return 1
return 0
/obj/machinery/proc/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/I)
if(I.tool_behaviour != TOOL_SCREWDRIVER)
return FALSE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
if(!I.use_tool(src, user, 0, volume = 0))
return FALSE
if(!(flags & NODECONSTRUCT))
if(!panel_open)
@@ -424,17 +425,19 @@ Class Procs:
panel_open = 0
icon_state = icon_state_closed
to_chat(user, "<span class='notice'>You close the maintenance hatch of [src].</span>")
I.play_tool_sound(user, I.tool_volume)
return 1
return 0
/obj/machinery/proc/default_change_direction_wrench(mob/user, obj/item/I)
if(I.tool_behaviour != TOOL_WRENCH)
return FALSE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
if(!I.use_tool(src, user, 0, volume = 0))
return FALSE
if(panel_open)
dir = turn(dir,-90)
to_chat(user, "<span class='notice'>You rotate [src].</span>")
I.play_tool_sound(user, I.tool_volume)
return TRUE
return FALSE
code/game/machinery/vending.dm
+3 -4
View File
@@ -307,13 +307,12 @@
/obj/machinery/vending/wirecutter_act(mob/user, obj/item/I)
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
wires.Interact(user)
if(I.use_tool(src, user, 0, volume = 0))
wires.Interact(user)
/obj/machinery/vending/wrench_act(mob/user, obj/item/I)
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
if(!I.use_tool(src, user, 0, volume = 0))
return
default_unfasten_wrench(user, I, time = 60)
code/game/objects/objs.dm
+1 -1
View File
@@ -293,7 +293,7 @@ a {
return FALSE
if(I.tool_behaviour != TOOL_WRENCH)
return FALSE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
if(!I.tool_use_check(user, 0))
return FALSE
if(!(flags & NODECONSTRUCT))
to_chat(user, "<span class='notice'>Now [anchored ? "un" : ""]securing [name].</span>")