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

- Converts honeycomb from reagent_containers to type reagent_containers/food/snacks. (#18922)

Browse Source 
- Adds honeycomb as an item that can be picked up in plant bags.
This commit is contained in:
Pidgey
2022-08-31 22:20:26 +10:00
committed by GitHub
parent 92f6d88b35
commit ddfecf85f5
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/beekeeping/beebox.dm
+2 -2
View File
@@ -96,7 +96,7 @@
if(bee_resources >= BEE_RESOURCE_HONEYCOMB_COST)
if(honeycombs.len < get_max_honeycomb())
bee_resources = max(bee_resources-BEE_RESOURCE_HONEYCOMB_COST, 0)
var/obj/item/reagent_containers/honeycomb/HC = new(src)
var/obj/item/reagent_containers/food/snacks/honeycomb/HC = new(src)
if(queen_bee.beegent)
HC.set_reagent(queen_bee.beegent.id)
honeycombs += HC
@@ -245,7 +245,7 @@
var/amtH = HF.honeycomb_capacity
var/fallen = 0
while(honeycombs.len && amtH) //let's pretend you always grab the frame with the most honeycomb on it
var/obj/item/reagent_containers/honeycomb/HC = pick_n_take(honeycombs)
var/obj/item/reagent_containers/food/snacks/honeycomb/HC = pick_n_take(honeycombs)
if(HC)
HC.forceMove(get_turf(src))
amtH--
code/modules/hydroponics/beekeeping/honeycomb.dm
+5 -5
View File
@@ -1,5 +1,5 @@
/obj/item/reagent_containers/honeycomb
/obj/item/reagent_containers/food/snacks/honeycomb
name = "honeycomb"
desc = "A hexagonal mesh of honeycomb."
icon = 'icons/obj/hydroponics/harvest.dmi'
@@ -11,16 +11,16 @@
list_reagents = list("honey" = 5)
var/honey_color = ""
/obj/item/reagent_containers/honeycomb/Initialize(mapload)
/obj/item/reagent_containers/food/snacks/honeycomb/Initialize(mapload)
. = ..()
pixel_x = rand(8,-8)
pixel_y = rand(8,-8)
update_icon(UPDATE_OVERLAYS)
/obj/item/reagent_containers/honeycomb/set_APTFT()
/obj/item/reagent_containers/food/snacks/honeycomb/set_APTFT()
set hidden = TRUE
/obj/item/reagent_containers/honeycomb/update_overlays()
/obj/item/reagent_containers/food/snacks/honeycomb/update_overlays()
. = ..()
var/image/honey
if(honey_color)
@@ -31,7 +31,7 @@
. += honey
/obj/item/reagent_containers/honeycomb/proc/set_reagent(reagent)
/obj/item/reagent_containers/food/snacks/honeycomb/proc/set_reagent(reagent)
var/datum/reagent/R = GLOB.chemical_reagents_list[reagent]
if(istype(R))
name = "honeycomb ([R.name])"
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+1 -2
View File
@@ -52,8 +52,7 @@
//All types that you can put into the grinder to transfer the reagents to the beaker. !Put all recipes above this.!
/obj/item/slime_extract = list(),
/obj/item/reagent_containers/food = list(),
/obj/item/reagent_containers/honeycomb = list()
/obj/item/reagent_containers/food = list()
)
var/list/juice_items = list (