From a01a87faca97899fde7e2d8a1642a814f3c10bbb Mon Sep 17 00:00:00 2001 From: Heroman Date: Mon, 22 Nov 2021 18:48:49 +1000 Subject: [PATCH] Fixes Claw Machine arcade --- code/game/machinery/computer/arcade.dm | 12 ++++++------ .../research/designs/circuits/circuits.dm | 11 +++++++++-- icons/obj/computer.dmi | Bin 169059 -> 169063 bytes 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 4061c677db5..9919fc3ee46 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -1083,7 +1083,7 @@ /obj/machinery/computer/arcade/clawmachine name = "AlliCo Grab-a-Gift" desc = "Show off your arcade skills for that special someone!" - icon_state = "clawmachine" + icon_state = "clawmachine_new" icon_keyboard = null icon_screen = null circuit = /obj/item/weapon/circuitboard/arcade/clawmachine @@ -1244,10 +1244,10 @@ /// TGUI Stuff -/obj/machinery/computer/arcade/clawmachine/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state) - ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) +/obj/machinery/computer/arcade/clawmachine/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, ui_key, "ClawMachine", name, 300, 400, master_ui, state) + ui = new(user, src, "ClawMachine", name, ui_x = 300, ui_y = 400) ui.autoupdate = TRUE ui.open() @@ -1270,7 +1270,7 @@ if(action == "newgame" && gamepaid == 1) gameStatus = "CLAWMACHINE_ON" - icon_state = "clawmachine_move" + icon_state = "clawmachine_new_move" instructions = "Guide the claw to the prize you want!" wintick = 0 @@ -1307,7 +1307,7 @@ winscreen = "Aw, shucks. Try again!" wintick = 0 gamepaid = 0 - icon_state = "clawmachine" + icon_state = "clawmachine_new" gameStatus = "CLAWMACHINE_END" /obj/machinery/computer/arcade/clawmachine/emag_act(mob/user) diff --git a/code/modules/research/designs/circuits/circuits.dm b/code/modules/research/designs/circuits/circuits.dm index fbf41ab8067..cd28842f00a 100644 --- a/code/modules/research/designs/circuits/circuits.dm +++ b/code/modules/research/designs/circuits/circuits.dm @@ -36,14 +36,21 @@ CIRCUITS BELOW id = "oriontrail" req_tech = list(TECH_DATA = 1) build_path = /obj/item/weapon/circuitboard/arcade/orion_trail - sort_string = "MAAAZ" // Duplicate string, really need to redo this whole thing + sort_string = "MAAAB" + +/datum/design/circuit/clawmachine + name = "grab-a-gift arcade machine" + id = "clawmachine" + req_tech = list(TECH_DATA = 1) + build_path = /obj/item/weapon/circuitboard/arcade/clawmachine + sort_string = "MAAAC" /datum/design/circuit/jukebox name = "jukebox" id = "jukebox" req_tech = list(TECH_MAGNET = 2, TECH_DATA = 1) build_path = /obj/item/weapon/circuitboard/jukebox - sort_string = "MAAAB" + sort_string = "MAAAO" /datum/design/circuit/seccamera name = "security camera monitor" diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi index a52ac02d69bc453b75c72ef5eb8fd5d8b0e13b6d..8ae5c06b72f1e62ccc7160fd0ddad650c24ae233 100644 GIT binary patch delta 1092 zcmV-K1iSm=s0!z(3XmiL&XFZa1?0?d{y33yS^@Ww&KiGYWJKLgT&ca~8g9sC0(rM| zmoQU^b(eYo16GQp-HN=pBe8e*NNN#a8SeK9}0v z%SFIcVEupBMS2GX)_+|RamBRsz`aICa-J)a zO6*vTZiS{8^NJ+d(xDP)9`FX-#LAF@8m*r$`h`iXb~i9h0T7Lqv04|VDz3ruNWu@D zdXq2n?nlrB{Hzr^d5oO?U;Ws~J74!wlWY=#X*Ox-Dv$Z~3CLp^ zCxm~IRJ8P5XF*il9)QvI578{vemsYve#`hl&|BPL#8RC+EUHMAS>Hv-T@$XknOI2# zYCWC^gM75gSNUo_vv888%F*rAJ0M z2W67bnkflG)yqNSII206+*xiTh6p0@DfCuUCF54`GA(usqe>&qk(XfIFff&+Jt#Oz zM{=7hbX2rd9xK6v@bU=EACr3?;`OJGq7El&P6%HQ3Y?JSj^vCb)u%IldY=U5Ac21g zu79&f5om#pX3nr;apzcR8STg z9x5+T*G$1a?U*fo1Uo*~2P!tQj!K;lm71=ME1F zNad#jMVM-I$2?#T(m*>E&{ce;P>C0+5_W6g+V@JdLRtSK;Z9c z#Jf7b&%L+!E&bY#Xh|*cExecpCyZj-Ws^9xl5~$8tYSOvy^7`DO@!XN^0j|I*1S>1 zxh?cxI`nNCn0N#?NhUMi=p0@i88vb9^2p+ap$Bwe99r6b9{vs}sa=y2s__L%}c&kq)zm19OP<_&s2>RSHVVI$!6j zI~r{mE*i$Y#^fID_@~38Ua1>I!$yCOUCuve-+sJgFW+D1{{zeN8*A%*-m!!C1c&zo K0k`)A0&I^Cd>Ie` delta 1088 zcmV-G1i$;|s0!n#3XmiL%8?~W1;d%){E?A!S^@Qu&KiGoWJKFeT&ca~8g9sC0(mF8 zOPDFdx=THP0V_q)Z$)0*k=Q$YB&`Ur4EOsa9<0T55OMjimp>`d2BISAc>$7?ye$6! zy7m#-f%Bg8=K=0&v7#@uZ&OG}0V~#cjH|k#|4( zGHBa)g_5kT@dTD>G}6Z^a?tM9`8r?c>j<5lxQ&0*q}cYks_|aIFzK-u^}XiIoUjmU zv12{DRhr_=E0W|(hf1J%z#DKAYeNcZw0^qk7bdaW-M};hKr~jydRZWdeBEnJ@<|A$`J}09m6mJazXn`nN7pw~9`oxHkjE-c z2qS-)Xz8`if~dGX0HduRqFHSGcn(wjR`G+Rx46TIr#f|5RFN*TzRQriAzX7av6BeY zdb|(@^=Or^^3{B1;UrC&-8Fuu@Ic6pyvT$1CSs2kjEfEIztDp!R4CARi;?+~+KAkT zDdlL<4(pHDp^LboFB8T>d(h7}+E}O$QoVn0o_mSWGt@mYap)Q#bnKy^yJn;q4?>}X zGD&FNl!T$`)u3@4)g4OiEVmIy1ey30Mk}h4aVvP4R=b5!wUOq?OR#Pjn5xnq6da`^ zh0PT@s#>a!mEb{mc?9N<$u$r0{?kWMFDGhFNM8>MoRH*+=qag)^lkz7(a}Dq}F-r6W$>-wL(6zLta>Zgj|SN`v%nLnXZ3(NLRe}STkZ9yb{taYYL3q2U|2{Cb&UKJ0cW6 zX)Y>hBHc26iVmo(Ry?L!F_3t%%cfA|Nk;ra(`cgc)SXEBD6w4}E77G6w)6Ru!eu}K_SNjg6ccCQ`xUd3weCPMEW_1Yh4-Y9?9xGnTw zI`nNCn79QuO(rwm=p0@i8MR>Z^2p*1p$Bwe99o*tvjU^dAbOvFR%(>IiI%iMrT>Vm zi&4~kzSuDVe^Hl6IiKU1G#;$L^gh<2p1c&