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

Merge pull request #16714 from SteelSlayer/claw-machine-fix

Browse Source 
Fixes the Claw Game arcade machine being impossible to deconstruct.
This commit is contained in:
variableundefined
2021-09-17 20:37:18 -05:00
committed by GitHub
parent cc29b0f7ad 950b64c9af
commit 44308cbc44
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
code/modules/arcade/arcade_base.dm
View File

@@ -59,12 +59,8 @@
to_chat(user, "Someone else is already playing this machine, please wait your turn!")
return
/obj/machinery/arcade/attackby(obj/item/O as obj, mob/user as mob, params)
if(istype(O, /obj/item/screwdriver) && anchored)
playsound(src.loc, O.usesound, 50, 1)
panel_open = !panel_open
to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.")
update_icon()
/obj/machinery/arcade/attackby(obj/item/O, mob/user, params)
if(exchange_parts(user, O))
return
if(!freeplay)
if(istype(O, /obj/item/card/id))
@@ -76,12 +72,22 @@
var/obj/item/stack/spacecash/C = O
if(pay_with_cash(C, user))
tokens += 1
return
if(panel_open && component_parts && istype(O, /obj/item/crowbar))
default_deconstruction_crowbar(user, O)
return
return
return ..()
/obj/machinery/arcade/screwdriver_act(mob/living/user, obj/item/I)
if(!anchored)
return FALSE
default_deconstruction_screwdriver(user, icon_state, icon_state, I)
update_icon()
return TRUE
/obj/machinery/arcade/crowbar_act(mob/living/user, obj/item/I)
if(!component_parts || !panel_open)
return FALSE
default_deconstruction_crowbar(user, I)
return TRUE
/obj/machinery/arcade/update_icon()
return