here we go again (#2456)

This commit is contained in:
LetterJay
2017-08-24 21:24:25 -05:00
committed by kevinz000
parent c7ed043fd5
commit 188193eb61
1107 changed files with 25420 additions and 25417 deletions
@@ -90,7 +90,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/weapon/reagent_containers/honeycomb/HC = new(src)
var/obj/item/reagent_containers/honeycomb/HC = new(src)
if(queen_bee.beegent)
HC.set_reagent(queen_bee.beegent.id)
honeycombs += HC
@@ -152,7 +152,7 @@
else
to_chat(user, "<span class='warning'>There's no room for any more frames in the apiary!</span>")
if(istype(I, /obj/item/weapon/wrench))
if(istype(I, /obj/item/wrench))
if(default_unfasten_wrench(user, I, time = 20))
return
@@ -222,7 +222,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/weapon/reagent_containers/honeycomb/HC = pick_n_take(honeycombs)
var/obj/item/reagent_containers/honeycomb/HC = pick_n_take(honeycombs)
if(HC)
HC.loc = get_turf(user)
amtH--
@@ -1,5 +1,5 @@
/obj/item/weapon/reagent_containers/honeycomb
/obj/item/reagent_containers/honeycomb
name = "honeycomb"
desc = "A hexagonal mesh of honeycomb."
icon = 'icons/obj/hydroponics/harvest.dmi'
@@ -12,14 +12,14 @@
list_reagents = list("honey" = 5)
var/honey_color = ""
/obj/item/weapon/reagent_containers/honeycomb/New()
/obj/item/reagent_containers/honeycomb/New()
..()
pixel_x = rand(8,-8)
pixel_y = rand(8,-8)
update_icon()
/obj/item/weapon/reagent_containers/honeycomb/update_icon()
/obj/item/reagent_containers/honeycomb/update_icon()
cut_overlays()
var/mutable_appearance/honey_overlay = mutable_appearance(icon, "honey")
if(honey_color)
@@ -28,7 +28,7 @@
add_overlay(honey_overlay)
/obj/item/weapon/reagent_containers/honeycomb/proc/set_reagent(reagent)
/obj/item/reagent_containers/honeycomb/proc/set_reagent(reagent)
var/datum/reagent/R = GLOB.chemical_reagents_list[reagent]
if(istype(R))
name = "honeycomb ([R.name])"