Skip to content

Commit

Permalink
Resprites Fridges! (#3549)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Does what it says on the tin, finally implementing sprites done in
collaboration with the exceedingly talented Spookywastaken. Thank you
for that first sprite dog, I wouldn't have finished this monstrosity
without your help.

![image](https://github.com/user-attachments/assets/be838ef6-e61b-4b67-a72d-f679cd595a82)

This PR also surprisingly fixes a bug where the broken state of the
smartfridge wouldn't display due to the fact someone forgot to add it in
code. Whoops.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Death to all cruft in our server.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl: Spooky, PositiveEntropy
imageadd: Smartfridges and Booze-O-Mats have been resprited!
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Imaginos16 authored Oct 13, 2024
1 parent dba005e commit 54d83b6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
idle_power_usage = IDLE_DRAW_MINIMAL
active_power_usage = ACTIVE_DRAW_MINIMAL
circuit = /obj/item/circuitboard/machine/smartfridge
integrity_failure = 0.4

var/max_n_of_items = 1500
var/allow_ai_retrieve = FALSE
Expand Down Expand Up @@ -40,7 +41,10 @@
. += "<span class='notice'>The status display reads: This unit can hold a maximum of <b>[max_n_of_items]</b> items.</span>"

/obj/machinery/smartfridge/update_icon_state()
if(machine_stat)
if(machine_stat & BROKEN)
icon_state = "[initial(icon_state)]-broken"
return ..()
else if(!powered())
icon_state = "[initial(icon_state)]-off"
return ..()

Expand All @@ -53,10 +57,8 @@
icon_state = "[initial(icon_state)]"
if(1 to 25)
icon_state = "[initial(icon_state)]1"
if(26 to 75)
if(26 to INFINITY)
icon_state = "[initial(icon_state)]2"
if(76 to INFINITY)
icon_state = "[initial(icon_state)]3"
return ..()

/obj/machinery/smartfridge/update_overlays()
Expand Down
Binary file modified icons/obj/vending.dmi
Binary file not shown.

0 comments on commit 54d83b6

Please sign in to comment.