cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 10:03:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1029 from Kelenius/dankMemes

Browse Source 
Sprites for drying racks, bees for hydroponics
This commit is contained in:
Datraen
2016-02-21 11:33:16 -05:00
parent 9d269ab470 a797f7931d
commit 5cb69f01a3
5 changed files with 71 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/game/machinery/kitchen/smartfridge.dm
View File

@@ -122,6 +122,9 @@
/obj/machinery/smartfridge/drying_rack
name = "\improper Drying Rack"
desc = "A machine for drying plants."
icon_state = "drying_rack"
icon_on = "drying_rack_on"
icon_off = "drying_rack"
/obj/machinery/smartfridge/drying_rack/accept_check(var/obj/item/O as obj)
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/))
@@ -132,8 +135,23 @@
/obj/machinery/smartfridge/drying_rack/process()
..()
if (contents.len)
if(stat & (BROKEN|NOPOWER))
return
if(contents.len)
dry()
update_icon()
/obj/machinery/smartfridge/drying_rack/update_icon()
overlays.Cut()
var/not_working = stat & (BROKEN|NOPOWER)
if(not_working)
icon_state = icon_off
else
icon_state = icon_on
if(contents.len)
overlays += "drying_rack_filled"
if(!not_working)
overlays += "drying_rack_drying"
/obj/machinery/smartfridge/drying_rack/proc/dry()
for(var/obj/item/weapon/reagent_containers/food/snacks/S in contents)

2
code/modules/hydroponics/beekeeping/beehive.dm
View File

@@ -89,7 +89,7 @@
bee_count = 20
B.empty()
else
user.visible_message("<span class='notice'>[user] puts bees and larvae from \the [src] into \the [I].</span>", "<span class='notice'>You put puts bees and larvae from \the [src] into \the [I].</span>")
user.visible_message("<span class='notice'>[user] puts bees and larvae from \the [src] into \the [I].</span>", "<span class='notice'>You put bees and larvae from \the [src] into \the [I].</span>")
bee_count /= 2
B.fill()
update_icon()