From fbb9f7d767bf66122fa9f2082a8f4d1e109958ca Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Wed, 9 Mar 2022 23:19:20 -0500 Subject: [PATCH] New weight machine sprites and names (#65335) imageadd: New sprites for the weight machines. --- code/game/objects/structures/gym.dm | 37 ++++++++++++++++------------ goon/icons/obj/fitness.dmi | Bin 1730 -> 611 bytes icons/obj/weightmachine.dmi | Bin 0 -> 1718 bytes 3 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 icons/obj/weightmachine.dmi diff --git a/code/game/objects/structures/gym.dm b/code/game/objects/structures/gym.dm index d835184b3ab..c07c4de762c 100644 --- a/code/game/objects/structures/gym.dm +++ b/code/game/objects/structures/gym.dm @@ -21,16 +21,25 @@ L.apply_status_effect(/datum/status_effect/exercised) /obj/structure/weightmachine - name = "weight machine" desc = "Just looking at this thing makes you feel tired." density = TRUE anchored = TRUE blocks_emissive = EMISSIVE_BLOCK_UNIQUE - var/icon_state_inuse + icon = 'icons/obj/weightmachine.dmi' /obj/structure/weightmachine/proc/AnimateMachine(mob/living/user) return +/obj/structure/weightmachine/update_icon_state() + . = ..() + icon_state = (obj_flags & IN_USE) ? "[base_icon_state]-u" : base_icon_state + +/obj/structure/weightmachine/update_overlays() + . = ..() + + if(obj_flags & IN_USE) + . += mutable_appearance(icon, "[base_icon_state]-o", plane = GAME_PLANE_UPPER, layer = ABOVE_MOB_LAYER, alpha = src.alpha) + /obj/structure/weightmachine/attack_hand(mob/living/user, list/modifiers) . = ..() if(.) @@ -42,7 +51,7 @@ return else obj_flags |= IN_USE - icon_state = icon_state_inuse + update_appearance() user.setDir(SOUTH) user.Stun(80) user.forceMove(src.loc) @@ -52,17 +61,17 @@ playsound(user, 'sound/machines/click.ogg', 60, TRUE) obj_flags &= ~IN_USE + update_appearance() user.pixel_y = user.base_pixel_y var/finishmessage = pick("You feel stronger!","You feel like you can take on the world!","You feel robust!","You feel indestructible!") SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "exercise", /datum/mood_event/exercise) - icon_state = initial(icon_state) to_chat(user, finishmessage) user.apply_status_effect(/datum/status_effect/exercised) /obj/structure/weightmachine/stacklifter - icon = 'goon/icons/obj/fitness.dmi' - icon_state = "fitnesslifter" - icon_state_inuse = "fitnesslifter2" + name = "chest press machine" + icon_state = "stacklifter" + base_icon_state = "stacklifter" /obj/structure/weightmachine/stacklifter/AnimateMachine(mob/living/user) var/lifts = 0 @@ -73,28 +82,24 @@ animate(user, pixel_y = -2, time = 3) sleep(3) animate(user, pixel_y = -4, time = 3) - sleep(3) + sleep(2) playsound(user, 'sound/machines/creak.ogg', 60, TRUE) /obj/structure/weightmachine/weightlifter - icon = 'goon/icons/obj/fitness.dmi' - icon_state = "fitnessweight" - icon_state_inuse = "fitnessweight-c" + name = "inline bench press" + icon_state = "benchpress" + base_icon_state = "benchpress" /obj/structure/weightmachine/weightlifter/AnimateMachine(mob/living/user) - var/mutable_appearance/swole_overlay = mutable_appearance(icon, "fitnessweight-w", WALL_OBJ_LAYER) - swole_overlay.plane = GAME_PLANE_UPPER - add_overlay(swole_overlay) var/reps = 0 user.pixel_y = 5 while (reps++ < 6) if (user.loc != src.loc) break for (var/innerReps = max(reps, 1), innerReps > 0, innerReps--) - sleep(3) + sleep(4) animate(user, pixel_y = (user.pixel_y == 3) ? 5 : 3, time = 3) playsound(user, 'sound/machines/creak.ogg', 60, TRUE) sleep(3) animate(user, pixel_y = 2, time = 3) sleep(3) - cut_overlay(swole_overlay) diff --git a/goon/icons/obj/fitness.dmi b/goon/icons/obj/fitness.dmi index e2675cbda49b2988150768979a1e31fbbe3410b2..2376a39024e78c327adbd660648de639841376d2 100644 GIT binary patch delta 474 zcmV<00VV#z4dVnQiBL{Q4GJ0x0000DNk~Le0001h0001B1Oos704G#udH?_b9+4#? z71Li7>;M1&0d!JMQvg8b*k%9#0D+O1cYj>U3a)-GV3z^_F-I_pw^lh^0004INkl zIefEpX8AvRz+m~`MuQWv|L6GtJ%8*AFyIW?18X$kfIr#*0w3lBoCv@I1U}3MI1#|a z0C)}Yj)Beqf3yJtKFkZ~09=5;hxq^}f*cWMsGJWLFh3CI19?JW`2YXr2TL^I{;pZ{ zWrHaU0PdOj0nQH)_sskN=LbY<`u88>Uv2<#PtOl(^b07*qoM6N<$g8JUgX#fBK delta 1601 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 M07*qoM6N<$f+Mph)&Kwi literal 0 HcmV?d00001