diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 3b64d71e28d..baa299d535a 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1062,28 +1062,26 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 15 containername = "exotic seeds crate" -/datum/supply_packs/organic/bee_keeper - name = "Beekeeping Crate" - contains = list(/obj/item/beezeez, - /obj/item/beezeez, - /obj/item/weapon/bee_net, - /obj/item/apiary, - /obj/item/queen_bee, - /obj/item/queen_bee, - /obj/item/queen_bee) - cost = 20 - containertype = /obj/structure/closet/crate/hydroponics - containername = "Beekeeping crate" - access = access_hydroponics - announce_beacons = list("Hydroponics" = list("Hydroponics")) +/datum/supply_packs/organic/hydroponics/beekeeping_fullkit + name = "Beekeeping Starter Kit" + contains = list(/obj/structure/beebox, + /obj/item/honey_frame, + /obj/item/honey_frame, + /obj/item/honey_frame, + /obj/item/queen_bee/bought, + /obj/item/clothing/head/beekeeper_head, + /obj/item/clothing/suit/beekeeper_suit) + cost = 15 + containername = "beekeeping starter kit" -/datum/supply_packs/organic/foodcart - name = "Food Cart crate" - contains = list(/obj/structure/foodcart) +/datum/supply_packs/organic/hydroponics/beekeeping_suits + name = "2 Beekeeper suits" + contains = list(/obj/item/clothing/head/beekeeper_head, + /obj/item/clothing/suit/beekeeper_suit, + /obj/item/clothing/head/beekeeper_head, + /obj/item/clothing/suit/beekeeper_suit) cost = 10 - containertype = /obj/structure/largecrate - containername = "food cart crate" - announce_beacons = list("Kitchen" = list("Kitchen")) + containername = "beekeeper suits" ////////////////////////////////////////////////////////////////////////////// //////////////////////////// Materials /////////////////////////////////////// diff --git a/code/game/machinery/bees_items.dm b/code/game/machinery/bees_items.dm deleted file mode 100644 index 41540788bb7..00000000000 --- a/code/game/machinery/bees_items.dm +++ /dev/null @@ -1,110 +0,0 @@ - -/obj/item/queen_bee - name = "queen bee packet" - desc = "Place her into an apiary so she can get busy." - icon = 'icons/obj/seeds.dmi' - icon_state = "seed-kudzu" - w_class = 1 - -/obj/item/weapon/bee_net - name = "bee net" - desc = "For catching rogue bees." - icon = 'icons/obj/apiary_bees_etc.dmi' - icon_state = "bee_net" - item_state = "bedsheet" - w_class = 3 - var/caught_bees = 0 - -/obj/item/weapon/bee_net/attack_self(mob/user as mob) - var/turf/T = get_step(get_turf(user), user.dir) - for(var/mob/living/simple_animal/bee/B in T) - if(B.feral < 0) - caught_bees += B.strength - qdel(B) - user.visible_message("\blue [user] nets some bees.","\blue You net up some of the becalmed bees.") - else - user.visible_message("\red [user] swings at some bees, they don't seem to like it.","\red You swing at some bees, they don't seem to like it.") - B.feral = 5 - B.target_mob = user - -/obj/item/weapon/bee_net/verb/empty_bees() - set src in usr - set name = "empty bee net" - set category = "Object" - var/mob/living/carbon/M - if(iscarbon(usr)) - M = usr - - while(caught_bees > 0) - //release a few super massive swarms - while(caught_bees > 5) - var/mob/living/simple_animal/bee/B = new(src.loc) - B.feral = 5 - B.target_mob = M - B.strength = 6 - B.icon_state = "bees_swarm" - caught_bees -= 6 - - //what's left over - var/mob/living/simple_animal/bee/B = new(src.loc) - B.strength = caught_bees - B.icon_state = "bees[B.strength]" - B.feral = 5 - B.target_mob = M - - caught_bees = 0 - -/obj/item/apiary - name = "moveable apiary" - icon = 'icons/obj/apiary_bees_etc.dmi' - icon_state = "apiary_item" - item_state = "giftbag" - w_class = 5 - -/obj/item/beezeez - name = "bottle of BeezEez" - icon = 'icons/obj/chemical.dmi' - icon_state = "bottle17" - New() - src.pixel_x = rand(-5.0, 5) - src.pixel_y = rand(-5.0, 5) - -/obj/item/weapon/reagent_containers/food/snacks/honeycomb - name = "honeycomb" - icon_state = "honeycomb" - desc = "Dripping with sugary sweetness." - -/obj/item/weapon/reagent_containers/food/snacks/honeycomb/New() - ..() - reagents.add_reagent("honey",15) - bitesize = 2 - -/obj/item/weapon/book/manual/hydroponics_beekeeping - name = "The Ins and Outs of Apiculture - A Precise Art" - icon_state ="bookHydroponicsBees" - author = "Beekeeper Dave" - title = "The Ins and Outs of Apiculture - A Precise Art" - dat = {" - - - - -

Raising Bees

- - Bees are loving but fickle creatures. Don't mess with their hive and stay away from any clusters of them, and you'll avoid their ire. - Sometimes, you'll need to dig around in there for those delicious sweeties though - in that case make sure you wear sealed protection gear - and carry an extinguisher or smoker with you - any bees chasing you, once calmed down, can thusly be netted and returned safely to the hive. - Beezeez is a cure-all panacea for them, but use it too much and the hive may grow to apocalyptic proportions. Other than that, bees are excellent pets - for all the family and are excellent caretakers of one's garden: having a hive or two around will aid in the longevity and growth rate of plants, - and aid them in fighting off poisons and disease. - - - - "} diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 11fa7f71393..0b9d9410f73 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -407,7 +407,7 @@ Class Procs: return 1 return 0 -/obj/machinery/proc/default_unfasten_wrench(mob/user, obj/item/weapon/wrench/W, time = 20) +/obj/proc/default_unfasten_wrench(mob/user, obj/item/weapon/wrench/W, time = 20) if(istype(W)) to_chat(user, "Now [anchored ? "un" : ""]securing [name].") playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 7cb53eaed5f..3fe6dc7102f 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -143,9 +143,10 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \ new/datum/stack_recipe("crossbow frame", /obj/item/weapon/crossbowframe, 5, time = 25, one_per_turf = 0, on_floor = 0), \ new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("apiary", /obj/item/apiary, 10, time = 25, one_per_turf = 0, on_floor = 0), \ new/datum/stack_recipe("easel", /obj/structure/easel, 3, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("wooden buckler", /obj/item/weapon/shield/riot/buckler, 20, time = 40), \ + new/datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),\ + new/datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),\ ) /obj/item/stack/sheet/wood diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index c661f3bead0..fb26aff5403 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -25,5 +25,4 @@ new /obj/item/clothing/mask/bandana/botany(src) new /obj/item/weapon/minihoe(src) new /obj/item/weapon/hatchet(src) - new /obj/item/weapon/bee_net(src) return \ No newline at end of file diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm new file mode 100644 index 00000000000..ef3fa5d10dc --- /dev/null +++ b/code/modules/hydroponics/beekeeping/beebox.dm @@ -0,0 +1,247 @@ + +#define BEEBOX_MAX_FRAMES 3 //Max frames per box +#define BEES_RATIO 0.5 //Multiplied by the max number of honeycombs to find the max number of bees +#define BEE_PROB_NEW_BEE 20 //The chance for spare bee_resources to be turned into new bees +#define BEE_RESOURCE_HONEYCOMB_COST 100 //The amount of bee_resources for a new honeycomb to be produced, percentage cost 1-100 +#define BEE_RESOURCE_NEW_BEE_COST 50 //The amount of bee_resources for a new bee to be produced, percentage cost 1-100 + + + +/mob/proc/bee_friendly() + return 0 + + +/mob/living/simple_animal/hostile/poison/bees/bee_friendly() + return 1 + + +/mob/living/carbon/human/bee_friendly() + if(get_species() == "Diona") //bees pollinate plants, duh. + return 1 + if((wear_suit && (wear_suit.flags & THICKMATERIAL)) && (head && (head.flags & THICKMATERIAL))) + return 1 + return 0 + + +/obj/structure/beebox + name = "apiary" + desc = "Dr Miles Manners is just your average Wasp themed super hero by day, but by night he becomes DR BEES!" + icon = 'icons/obj/apiary_bees.dmi' + icon_state = "beebox" + anchored = 1 + density = 1 + var/mob/living/simple_animal/hostile/poison/bees/queen/queen_bee = null + var/list/bees = list() //bees owned by the box, not those inside it + var/list/honeycombs = list() + var/list/honey_frames = list() + var/bee_resources = 0 + + +/obj/structure/beebox/New() + ..() + processing_objects.Add(src) + + +/obj/structure/beebox/Destroy() + processing_objects.Remove(src) + bees.Cut() + bees = null + honeycombs.Cut() + honeycombs = null + queen_bee = null + return ..() + + +//Premade apiaries can spawn with a random reagent +/obj/structure/beebox/premade + var/random_reagent = FALSE + + +/obj/structure/beebox/premade/New() + ..() + + var/datum/reagent/R = null + if(random_reagent) + R = pick(subtypesof(/datum/reagent)) + R = chemical_reagents_list[initial(R.id)] + + queen_bee = new(src) + queen_bee.beehome = src + bees += queen_bee + queen_bee.assign_reagent(R) + + for(var/i in 1 to BEEBOX_MAX_FRAMES) + var/obj/item/honey_frame/HF = new(src) + honey_frames += HF + + for(var/i in 1 to get_max_bees()) + var/mob/living/simple_animal/hostile/poison/bees/B = new(src) + bees += B + B.beehome = src + B.assign_reagent(R) + + +/obj/structure/beebox/premade/random + random_reagent = TRUE + + +/obj/structure/beebox/process() + if(queen_bee) + 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) + if(queen_bee.beegent) + HC.set_reagent(queen_bee.beegent.id) + honeycombs += HC + + if(bees.len < get_max_bees()) + var/freebee = FALSE //a freebee, geddit?, hahaha HAHAHAHA + if(bees.len <= 1) //there's always one set of worker bees, this isn't colony collapse disorder its 2d spessmen + freebee = TRUE + if((bee_resources >= BEE_RESOURCE_NEW_BEE_COST && prob(BEE_PROB_NEW_BEE)) || freebee) + if(!freebee) + bee_resources = max(bee_resources - BEE_RESOURCE_NEW_BEE_COST, 0) + var/mob/living/simple_animal/hostile/poison/bees/B = new(src) + B.beehome = src + B.assign_reagent(queen_bee.beegent) + bees += B + + +/obj/structure/beebox/proc/get_max_honeycomb() + . = 0 + for(var/hf in honey_frames) + var/obj/item/honey_frame/HF = hf + . += HF.honeycomb_capacity + + +/obj/structure/beebox/proc/get_max_bees() + . = get_max_honeycomb() * BEES_RATIO + + +/obj/structure/beebox/examine(mob/user) + ..() + + if(!queen_bee) + user << "There is no queen bee! There won't bee any honeycomb without a queen!" + + var/half_bee = get_max_bees()*0.5 + if(half_bee && (bees.len >= half_bee)) + user << "This place is a BUZZ with activity... there are lots of bees!" + + user << "[bee_resources]/100 resource supply." + user << "[bee_resources]% towards a new honeycomb." + user << "[bee_resources*2]% towards a new bee." + + if(honeycombs.len) + var/plural = honeycombs.len > 1 + user << "There [plural? "are" : "is"] [honeycombs.len] uncollected honeycomb[plural ? "s":""] in the apiary." + + if(honeycombs.len >= get_max_honeycomb()) + user << "there's no room for more honeycomb!" + + +/obj/structure/beebox/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/honey_frame)) + var/obj/item/honey_frame/HF = I + if(honey_frames.len < BEEBOX_MAX_FRAMES) + visible_message("[user] adds a frame to the apiary.") + user.unEquip(HF) + HF.loc = src + honey_frames += HF + else + user << "There's no room for anymore frames in the apiary!" + + if(istype(I, /obj/item/weapon/wrench)) + if(default_unfasten_wrench(user, I, time = 20)) + return + + if(istype(I, /obj/item/queen_bee)) + if(queen_bee) + user << "This hive already has a queen!" + return + + var/obj/item/queen_bee/qb = I + user.unEquip(qb) + + qb.queen.loc = src + bees += qb.queen + queen_bee = qb.queen + qb.queen = null + + if(queen_bee) + visible_message("[user] sets [qb] down inside the apiary, making it their new home.") + var/relocated = 0 + for(var/b in bees) + var/mob/living/simple_animal/hostile/poison/bees/B = b + if(B.reagent_incompatible(queen_bee)) + bees -= B + B.beehome = null + if(B.loc == src) + B.loc = get_turf(src) + relocated++ + if(relocated) + user << "This queen has a different reagent to some of the bees who live here, those bees will not return to this apiary!" + + else + user << "The queen bee disappeared! bees disappearing has been in the news lately..." + + qdel(qb) + + +/obj/structure/beebox/attack_hand(mob/user) + if(ishuman(user)) + if(!user.bee_friendly()) + //Time to get stung! + var/bees = FALSE + for(var/b in bees) //everyone who's ever lived here now instantly hates you, suck it assistant! + var/mob/living/simple_animal/hostile/poison/bees/B = b + if(B.isqueen) + continue + if(B.loc == src) + B.loc = get_turf(src) + B.target = user + bees = TRUE + if(bees) + visible_message("[user] disturbs the bees!") + else + var/option = alert(user, "What Action do you wish to perform?","Apiary","Remove a Honey Frame","Remove the Queen Bee") + if(!Adjacent(user)) + return + switch(option) + if("Remove a Honey Frame") + if(!honey_frames.len) + user << "There are no honey frames to remove!" + return + + var/obj/item/honey_frame/HF = pick_n_take(honey_frames) + if(HF) + if(!user.put_in_active_hand(HF)) + HF.loc = get_turf(src) + visible_message("[user] removes a frame from the apiary.") + + 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) + if(HC) + HC.loc = get_turf(user) + amtH-- + fallen++ + if(fallen) + var/multiple = fallen > 1 + visible_message("[user] scrapes [multiple ? "[fallen]" : "a"] honeycomb[multiple ? "s" : ""] off of the frame.") + + if("Remove the Queen Bee") + if(!queen_bee || queen_bee.loc != src) + user << "There is no queen bee to remove!" + return + var/obj/item/queen_bee/QB = new() + queen_bee.loc = QB + bees -= queen_bee + QB.queen = queen_bee + QB.name = queen_bee.name + if(!user.put_in_active_hand(QB)) + QB.loc = get_turf(src) + visible_message("[user] removes the queen from the apiary.") + queen_bee = null diff --git a/code/modules/hydroponics/beekeeping/beekeeper_suit.dm b/code/modules/hydroponics/beekeeping/beekeeper_suit.dm new file mode 100644 index 00000000000..889c807971b --- /dev/null +++ b/code/modules/hydroponics/beekeeping/beekeeper_suit.dm @@ -0,0 +1,16 @@ + +/obj/item/clothing/head/beekeeper_head + name = "beekeeper hat" + desc = "keeps the lil buzzing buggers out of your eyes" + icon_state = "beekeeper" + item_state = "beekeeper" + flags = THICKMATERIAL + + +/obj/item/clothing/suit/beekeeper_suit + name = "beekeeper suit" + desc = "keeps the lil buzzing buggers away from your squishy bits" + icon_state = "beekeeper" + item_state = "beekeeper" + flags = THICKMATERIAL + diff --git a/code/modules/hydroponics/beekeeping/honey_frame.dm b/code/modules/hydroponics/beekeeping/honey_frame.dm new file mode 100644 index 00000000000..a58ab7041c7 --- /dev/null +++ b/code/modules/hydroponics/beekeeping/honey_frame.dm @@ -0,0 +1,12 @@ + +/obj/item/honey_frame + name = "honey frame" + desc = "a scaffold for bees to build honeycomb on" + icon = 'icons/obj/apiary_bees.dmi' + icon_state = "honey_frame" + var/honeycomb_capacity = 10 //10 Honeycomb per frame by default, researchable frames perhaps? + + +/obj/item/honey_frame/New() + pixel_x = rand(8,-8) + pixel_y = rand(8,-8) diff --git a/code/modules/hydroponics/beekeeping/honeycomb.dm b/code/modules/hydroponics/beekeeping/honeycomb.dm new file mode 100644 index 00000000000..23588cc5c48 --- /dev/null +++ b/code/modules/hydroponics/beekeeping/honeycomb.dm @@ -0,0 +1,40 @@ + +/obj/item/weapon/reagent_containers/honeycomb + name = "honeycomb" + desc = "a hexagonal mesh of honeycomb" + icon = 'icons/obj/apiary_bees.dmi' + icon_state = "honeycomb" + possible_transfer_amounts = list() + disease_amount = 0 + volume = 10 + amount_per_transfer_from_this = 0 + list_reagents = list("honey" = 5) + var/honey_color = "" + +/obj/item/weapon/reagent_containers/honeycomb/New() + ..() + pixel_x = rand(8,-8) + pixel_y = rand(8,-8) + update_icon() + + +/obj/item/weapon/reagent_containers/honeycomb/update_icon() + overlays.Cut() + var/image/honey + if(honey_color) + honey = image(icon = 'icons/obj/apiary_bees.dmi', icon_state = "greyscale_honey") + honey.color = honey_color + else + honey = image(icon = 'icons/obj/apiary_bees.dmi', icon_state = "honey") + overlays += honey + + +/obj/item/weapon/reagent_containers/honeycomb/proc/set_reagent(reagent) + var/datum/reagent/R = chemical_reagents_list[reagent] + if(istype(R)) + name = "honeycomb ([R.name])" + honey_color = R.color + reagents.add_reagent(R.id,5) + else + honey_color = "" + update_icon() diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index d394fcefea8..d7039c29df3 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -49,6 +49,8 @@ var/last_plant_ikey //This is for debugging reference, and is otherwise useless. --FalseIncarnate + var/recent_bee_visit = FALSE //Have we been visited by a bee recently, so bees dont overpolinate one plant + /* * process() can be found in \code\modules\hydroponics\tray\tray_process.dm * reagent handling can be found in \code\modules\hydroponics\tray\tray_reagents.dm @@ -163,8 +165,7 @@ return if(closed_system) - if(user) - to_chat(user, "You can't harvest from the plant while the lid is shut.") + if(user) user << "You can't harvest from the plant while the lid is shut." return if(user) @@ -197,7 +198,7 @@ if(!user || !dead) return if(closed_system) - to_chat(user, "You can't remove the dead plant while the lid is shut.") + user << "You can't remove the dead plant while the lid is shut." return seed = null @@ -209,7 +210,7 @@ yield_mod = 0 mutation_mod = 0 - to_chat(user, "You remove the dead plant.") + user << "You remove the dead plant." check_health() return @@ -337,11 +338,11 @@ set src in view(1) if(labelled) - to_chat(usr, "You remove the label.") + usr << "You remove the label." labelled = null update_icon() else - to_chat(usr, "There is no label to remove.") + usr << "There is no label to remove." return /obj/machinery/portable_atmospherics/hydroponics/verb/setlight() @@ -352,7 +353,7 @@ var/new_light = input("Specify a light level.") as null|anything in list(0,1,2,3,4,5,6,7,8,9,10) if(new_light) tray_light = new_light - to_chat(usr, "You set the tray to a light level of [tray_light] lumens.") + usr << "You set the tray to a light level of [tray_light] lumens." /obj/machinery/portable_atmospherics/hydroponics/proc/check_level_sanity() //Make sure various values are sane. @@ -399,7 +400,7 @@ if(istype(O, /obj/item/weapon/crowbar)) if(anchored==2) - to_chat(user, "Unscrew the hoses first!") + user << "Unscrew the hoses first!" return default_deconstruction_crowbar(O, 1) @@ -411,11 +412,11 @@ var/obj/item/weapon/reagent_containers/glass/C = O //Check if container is empty if(!C.reagents.total_volume) - to_chat(user, "\red [C] is empty.") + user << "\red [C] is empty." return //Container not empty, transfer contents to tray var/trans = C.reagents.trans_to(src, C.amount_per_transfer_from_this) - to_chat(user, "\blue You transfer [trans] units of the solution to [src].") + user << "\blue You transfer [trans] units of the solution to [src]." check_level_sanity() process_reagents() @@ -428,7 +429,7 @@ toxins += P.toxicity pestlevel -= P.pest_kill_str weedlevel -= P.weed_kill_str - to_chat(user, "You spray [src] with [O].") + user << "You spray [src] with [O]." playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6) qdel(O) @@ -441,7 +442,7 @@ user.drop_item(O) toxins += W.toxicity weedlevel -= W.weed_kill_str - to_chat(user, "You spray [src] with [O].") + user << "You spray [src] with [O]." playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6) qdel(O) @@ -454,7 +455,7 @@ //Check if there is a plant in the tray if(seed) if(!S.reagents.total_volume) - to_chat(user, "\red [S] is empty.") + user << "\red [S] is empty." return //Container not empty, transfer contents to tray S.reagents.trans_to(src, S.amount_per_transfer_from_this) @@ -463,20 +464,20 @@ check_level_sanity() update_icon() else - to_chat(user, "There's nothing in [src] to spray!") + user << "There's nothing in [src] to spray!" else if(istype(O, /obj/item/weapon/screwdriver) && unwrenchable) //THIS NEED TO BE DONE DIFFERENTLY, SOMEONE REFACTOR THE TRAY CODE ALREADY if(anchored) if(anchored == 2) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) anchored = 1 - to_chat(user, "You unscrew the [src]'s hoses.") + user << "You unscrew the [src]'s hoses." panel_open = 0 else if(anchored == 1) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) anchored = 2 - to_chat(user, "You screw in the [src]'s hoses.") + user << "You screw in the [src]'s hoses." panel_open = 1 for(var/obj/machinery/portable_atmospherics/hydroponics/h in range(1,src)) @@ -486,15 +487,15 @@ if(istype(O, /obj/item/weapon/wirecutters) || istype(O, /obj/item/weapon/scalpel)) if(!seed) - to_chat(user, "There is nothing to take a sample from in \the [src].") + user << "There is nothing to take a sample from in \the [src]." return if(sampled) - to_chat(user, "You have already sampled from this plant.") + user << "You have already sampled from this plant." return if(dead) - to_chat(user, "The plant is dead.") + user << "The plant is dead." return // Create a sample. @@ -519,14 +520,14 @@ if(seed) return ..() else - to_chat(user, "There's no plant to inject.") + user << "There's no plant to inject." return 1 else if(seed) //Leaving this in in case we want to extract from plants later. - to_chat(user, "You can't get any extract out of this plant.") + user << "You can't get any extract out of this plant." else - to_chat(user, "There's nothing to draw something from.") + user << "There's nothing to draw something from." return 1 else if (istype(O, /obj/item/seeds)) @@ -537,11 +538,11 @@ user.drop_item(O) if(!S.seed) - to_chat(user, "The packet seems to be empty. You throw it away.") + user << "The packet seems to be empty. You throw it away." qdel(O) return - to_chat(user, "You plant the [S.seed.seed_name] [S.seed.seed_noun].") + user << "You plant the [S.seed.seed_name] [S.seed.seed_noun]." seed = S.seed //Grab the seed datum. dead = 0 age = 1 @@ -555,7 +556,7 @@ check_health() else - to_chat(user, "\The [src] already has seeds in it!") + user << "\The [src] already has seeds in it!" else if (istype(O, /obj/item/weapon/minihoe)) // The minihoe @@ -564,7 +565,7 @@ weedlevel = 0 update_icon() else - to_chat(user, "This plot is completely devoid of weeds. It doesn't need uprooting.") + user << "This plot is completely devoid of weeds. It doesn't need uprooting." else if (istype(O, /obj/item/weapon/storage/bag/plants)) @@ -584,24 +585,11 @@ playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) anchored = !anchored - to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") + user << "You [anchored ? "wrench" : "unwrench"] \the [src]." - else if(istype(O, /obj/item/apiary)) - - if(seed) - to_chat(user, "[src] is already occupied!") - else - user.drop_item() - qdel(O) - - var/obj/machinery/apiary/A = new(src.loc) - A.icon = src.icon - A.icon_state = src.icon_state - A.hydrotray_type = src.type - qdel(src) else if ((istype(O, /obj/item/weapon/tank) && !( src.destroyed ))) if (src.holding) - to_chat(user, "\blue There is alreadu a tank loaded into the [src].") + user << "\blue There is alreadu a tank loaded into the [src]." return var/obj/item/weapon/tank/T = O user.drop_item() @@ -636,26 +624,26 @@ ..(user) if(!seed) - to_chat(user, "[src] is empty.") + user << "[src] is empty." return - to_chat(user, "[seed.display_name] are growing here.") + user << "[seed.display_name] are growing here." if(!Adjacent(user)) return - to_chat(user, "Water: [round(waterlevel,0.1)]/[maxwater]") - to_chat(user, "Nutrient: [round(nutrilevel,0.1)]/[maxnutri]") + user << "Water: [round(waterlevel,0.1)]/[maxwater]" + user << "Nutrient: [round(nutrilevel,0.1)]/[maxnutri]" if(weedlevel >= 5) - to_chat(user, "\The [src] is infested with weeds!") + user << "\The [src] is infested with weeds!" if(pestlevel >= 5) - to_chat(user, "\The [src] is infested with tiny worms!") + user << "\The [src] is infested with tiny worms!" if(dead) - to_chat(user, "The plant is dead.") + user << "The plant is dead." else if(health <= (seed.get_trait(TRAIT_ENDURANCE)/ 2)) - to_chat(user, "The plant looks unhealthy.") + user << "The plant looks unhealthy." if(mechanical) var/turf/T = loc @@ -683,7 +671,7 @@ light_available = 5 light_string = "a light level of [light_available] lumens" - to_chat(user, "The tray's sensor suite is reporting [light_string] and a temperature of [environment.temperature]K.") + user << "The tray's sensor suite is reporting [light_string] and a temperature of [environment.temperature]K." /obj/machinery/portable_atmospherics/hydroponics/verb/close_lid_verb() set name = "Toggle Tray Lid" @@ -696,7 +684,7 @@ return closed_system = !closed_system - to_chat(user, "You [closed_system ? "close" : "open"] the tray's lid.") + user << "You [closed_system ? "close" : "open"] the tray's lid." update_icon() /obj/machinery/portable_atmospherics/hydroponics/verb/eject_tank_verb() @@ -710,9 +698,9 @@ return if(!holding) - to_chat(usr, "\red There is no tank loaded into [src] to eject.") + usr << "\red There is no tank loaded into [src] to eject." if(istype(holding, /obj/item/weapon/tank)) - to_chat(usr, "\blue You eject [holding.name] from [src].") + usr << "\blue You eject [holding.name] from [src]." holding.loc = loc - holding = null \ No newline at end of file + holding = null diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm new file mode 100644 index 00000000000..fdf97a7b0a2 --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -0,0 +1,284 @@ +#define BEE_IDLE_ROAMING 70 //The value of idle at which a bee in a beebox will try to wander +#define BEE_IDLE_GOHOME 0 //The value of idle at which a bee will try to go home +#define BEE_PROB_GOHOME 35 //Probability to go home when idle is below BEE_IDLE_GOHOME +#define BEE_PROB_GOROAM 5 //Probability to go roaming when idle is above BEE_IDLE_ROAMING +#define BEE_TRAY_RECENT_VISIT 200 //How long in deciseconds until a tray can be visited by a bee again +#define BEE_DEFAULT_COLOUR "#e5e500" //the colour we make the stripes of the bee if our reagent has no colour (or we have no reagent) + +#define BEE_POLLINATE_YIELD_CHANCE 10 +#define BEE_POLLINATE_PEST_CHANCE 33 +#define BEE_POLLINATE_POTENTCY_CHANCE 50 + +/mob/living/simple_animal/hostile/poison/bees + name = "bee" + desc = "buzzy buzzy bee, stingy sti- Ouch!" + icon_state = "" + icon_living = "" + icon = 'icons/mob/bees.dmi' + speak_emote = list("buzzes") + emote_hear = list("buzzes") + turns_per_move = 0 + melee_damage_lower = 1 + melee_damage_upper = 1 + attacktext = "stings" + response_help = "shoos" + response_disarm = "swats away" + response_harm = "squashes" + maxHealth = 10 + health = 10 + faction = list("hostile") + move_to_delay = 0 + environment_smash = 0 + mouse_opacity = 2 + pass_flags = PASSTABLE | PASSGRILLE | PASSMOB + flying = 1 + search_objects = 1 //have to find those plant trays! + + //Spaceborn beings don't get hurt by space + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) + minbodytemp = 0 + + var/datum/reagent/beegent = null //hehe, beegent + var/obj/structure/beebox/beehome = null + var/idle = 0 + var/isqueen = FALSE + var/icon_base = "bee" + var/static/list/bee_icons = list() + + +/mob/living/simple_animal/hostile/poison/bees/Process_Spacemove(movement_dir = 0) + return 1 + + +/mob/living/simple_animal/hostile/poison/bees/New() + ..() + generate_bee_visuals() + + +/mob/living/simple_animal/hostile/poison/bees/Destroy() + if(beehome) + beehome.bees -= src + beehome = null + beegent = null + return ..() + + +/mob/living/simple_animal/hostile/poison/bees/death(gibbed) + if(beehome) + beehome.bees -= src + beehome = null + beegent = null + ..() + ghostize() + qdel(src) + +/mob/living/simple_animal/hostile/poison/bees/examine(mob/user) + ..() + + if(!beehome) + to_chat(user, "This bee is homeless!") + + +/mob/living/simple_animal/hostile/poison/bees/proc/generate_bee_visuals() + overlays.Cut() + + var/col = BEE_DEFAULT_COLOUR + if(beegent && beegent.color) + col = beegent.color + + var/image/base + if(!bee_icons["[icon_base]_base"]) + bee_icons["[icon_base]_base"] = image(icon = 'icons/mob/bees.dmi', icon_state = "[icon_base]_base") + base = bee_icons["[icon_base]_base"] + overlays += base + + var/image/greyscale + if(!bee_icons["[icon_base]_grey_[col]"]) + bee_icons["[icon_base]_grey_[col]"] = image(icon = 'icons/mob/bees.dmi', icon_state = "[icon_base]_grey") + greyscale = bee_icons["[icon_base]_grey_[col]"] + greyscale.color = col + overlays += greyscale + + var/image/wings + if(!bee_icons["[icon_base]_wings"]) + bee_icons["[icon_base]_wings"] = image(icon = 'icons/mob/bees.dmi', icon_state = "[icon_base]_wings") + wings = bee_icons["[icon_base]_wings"] + overlays += wings + + +//We don't attack beekeepers/people dressed as bees//Todo: bee costume +/mob/living/simple_animal/hostile/poison/bees/CanAttack(atom/the_target) + . = ..() + if(!.) + return 0 + if(ishuman(the_target)) + var/mob/living/carbon/human/H = the_target + return !H.bee_friendly() + + +/mob/living/simple_animal/hostile/poison/bees/Found(atom/A) + if(istype(A, /obj/machinery/portable_atmospherics/hydroponics)) + var/obj/machinery/portable_atmospherics/hydroponics/Hydro = A + if(Hydro.seed && !Hydro.dead && !Hydro.recent_bee_visit) + wanted_objects |= /obj/machinery/portable_atmospherics/hydroponics //so we only hunt them while they're alive/seeded/not visisted + return 1 + if(ishuman(A)) + var/mob/living/carbon/human/H = A + return !H.bee_friendly() + return 0 + + +/mob/living/simple_animal/hostile/poison/bees/AttackingTarget() + //Pollinate + if(istype(target, /obj/machinery/portable_atmospherics/hydroponics)) + var/obj/machinery/portable_atmospherics/hydroponics/Hydro = target + pollinate(Hydro) + else if(target == beehome) + var/obj/structure/beebox/BB = target + loc = BB + target = null + wanted_objects -= /obj/structure/beebox //so we don't attack beeboxes when not going home + else + if(beegent && isliving(target)) + var/mob/living/L = target + beegent.reaction_mob(L, TOUCH) + L.reagents.add_reagent(beegent.id, rand(1,5)) + target.attack_animal(src) + + +/mob/living/simple_animal/hostile/poison/bees/proc/assign_reagent(datum/reagent/R) + if(istype(R)) + beegent = R + name = "[initial(name)] ([R.name])" + generate_bee_visuals() + + +/mob/living/simple_animal/hostile/poison/bees/proc/pollinate(obj/machinery/portable_atmospherics/hydroponics/Hydro) + if(!istype(Hydro) || !Hydro.seed || Hydro.dead || Hydro.recent_bee_visit) + target = null + return + + target = null //so we pick a new hydro tray next FindTarget(), instead of loving the same plant for eternity + wanted_objects -= /obj/machinery/portable_atmospherics/hydroponics //so we only hunt them while they're alive/seeded/not visisted + Hydro.recent_bee_visit = TRUE + spawn(BEE_TRAY_RECENT_VISIT) + if(Hydro) + Hydro.recent_bee_visit = FALSE + + var/growth = health //Health also means how many bees are in the swarm, roughly. + //better healthier plants! + Hydro.health += round(growth*0.5) + if(prob(BEE_POLLINATE_PEST_CHANCE)) + Hydro.pestlevel = max(0, --Hydro.pestlevel) + if(prob(BEE_POLLINATE_YIELD_CHANCE)) //Yield mod is HELLA powerful, but quite rare + var/seed_yield = Hydro.seed.get_trait(TRAIT_YIELD) + Hydro.seed.set_trait(TRAIT_YIELD, seed_yield + 1, 10, 0) + if(prob(BEE_POLLINATE_POTENTCY_CHANCE)) + var/seed_potency = Hydro.seed.get_trait(TRAIT_POTENCY) + Hydro.seed.set_trait(TRAIT_POTENCY, seed_potency + 1, 200, 0) + + if(beehome) + beehome.bee_resources = min(beehome.bee_resources + growth, 100) + + +/mob/living/simple_animal/hostile/poison/bees/handle_automated_action() + . = ..() + if(!.) + return + + if(!isqueen) + if(loc == beehome) + idle = min(100, ++idle) + if(idle >= BEE_IDLE_ROAMING && prob(BEE_PROB_GOROAM)) + loc = get_turf(beehome) + else + idle = max(0, --idle) + if(idle <= BEE_IDLE_GOHOME && prob(BEE_PROB_GOHOME)) + if(!FindTarget()) + wanted_objects += /obj/structure/beebox //so we don't attack beeboxes when not going home + target = beehome + if(!beehome) //add outselves to a beebox (of the same reagent) if we have no home + for(var/obj/structure/beebox/BB in view(vision_range, src)) + if(reagent_incompatible(BB.queen_bee) || BB.bees.len >= BB.get_max_bees()) + continue + BB.bees |= src + beehome = BB + + + /mob/living/simple_animal/hostile/poison/bees/queen + name = "queen bee" + desc = "she's the queen of bees, BZZ BZZ" + icon_base = "queen" + isqueen = TRUE + + + //the Queen doesn't leave the box on her own, and she CERTAINLY doesn't pollinate by herself +/mob/living/simple_animal/hostile/poison/bees/queen/Found(atom/A) + return 0 + + +//leave pollination for the peasent bees +/mob/living/simple_animal/hostile/poison/bees/queen/AttackingTarget() + if(beegent && isliving(target)) + var/mob/living/L = target + beegent.reaction_mob(L, TOUCH) + L.reagents.add_reagent(beegent.id, rand(1,5)) + target.attack_animal(src) + + +//PEASENT BEES +/mob/living/simple_animal/hostile/poison/bees/queen/pollinate() + return + + +/mob/living/simple_animal/hostile/poison/bees/proc/reagent_incompatible(mob/living/simple_animal/hostile/poison/bees/B) + if(!B) + return 0 + if(B.beegent && beegent && B.beegent.id != beegent.id || B.beegent && !beegent || !B.beegent && beegent) + return 1 + return 0 + + +/obj/item/queen_bee + name = "queen bee" + desc = "she's the queen of bees, BZZ BZZ" + icon_state = "queen_item" + item_state = "" + icon = 'icons/mob/bees.dmi' + var/mob/living/simple_animal/hostile/poison/bees/queen/queen + + +/obj/item/queen_bee/attackby(obj/item/I, mob/user, params) + if(istype(I,/obj/item/weapon/reagent_containers/syringe)) + var/obj/item/weapon/reagent_containers/syringe/S = I + if(S.reagents.has_reagent("royal_bee_jelly")) //checked twice, because I really don't want royal bee jelly to be duped + if(S.reagents.has_reagent("royal_bee_jelly",5)) + S.reagents.remove_reagent("royal_bee_jelly", 5) + var/obj/item/queen_bee/qb = new(get_turf(user)) + qb.queen = new(qb) + if(queen && queen.beegent) + qb.queen.assign_reagent(queen.beegent) //Bees use the global singleton instances of reagents, so we don't need to worry about one bee being deleted and her copies losing their reagents. + user.put_in_active_hand(qb) + user.visible_message("[user] injects [src] with royal bee jelly, causing it to split into two bees, MORE BEES!","You inject [src] with royal bee jelly, causing it to split into two bees, MORE BEES!") + else + to_chat(user, "You don't have enough royal bee jelly to split a bee in two!") + else + var/datum/reagent/R = chemical_reagents_list[S.reagents.get_master_reagent_id()] + if(R && S.reagents.has_reagent(R.id, 5)) + S.reagents.remove_reagent(R.id,5) + queen.assign_reagent(R) + user.visible_message("[user] injects [src]'s genome with [R.name], mutating it's DNA!","You inject [src]'s genome with [R.name], mutating it's DNA!") + name = queen.name + else + to_chat(user, "You don't have enough units of that chemical to modify the bee's DNA!") + ..() + + +/obj/item/queen_bee/bought/New() + ..() + queen = new(src) + + +/obj/item/queen_bee/Destroy() + qdel(queen) + return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index d3a87be35e1..08434268270 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -148,7 +148,7 @@ return 0 return 1 if(isobj(the_target)) - if(the_target.type in wanted_objects) + if(is_type_in_list(the_target, wanted_objects)) return 1 return 0 diff --git a/code/modules/mob/living/simple_animal/hostile/poison_bees.dm b/code/modules/mob/living/simple_animal/hostile/poison_bees.dm deleted file mode 100644 index c8a6a79fb04..00000000000 --- a/code/modules/mob/living/simple_animal/hostile/poison_bees.dm +++ /dev/null @@ -1,65 +0,0 @@ -/mob/living/simple_animal/hostile/poison/bees - name = "space bee swarm" - desc = "" - icon_state = "bee_1" - icon_living = "bee" - speak_emote = list("buzzes") - emote_hear = list("buzzes") - turns_per_move = 0 - melee_damage_lower = 1 - melee_damage_upper = 1 - attacktext = "stings" - response_help = "shoos" - response_disarm = "swats away" - response_harm = "squashes" - maxHealth = 10 - health = 10 - faction = list("hostile") - move_to_delay = 0 - environment_smash = 0 - mouse_opacity = 2 - pass_flags = PASSTABLE | PASSGRILLE | PASSMOB - flying = 1 - - //Spaceborn beings don't get hurt by space - atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) - minbodytemp = 0 - gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE - -/mob/living/simple_animal/hostile/poison/bees/Process_Spacemove(var/check_drift = 0) - return 1 - -/mob/living/simple_animal/hostile/poison/bees/New() - ..() - var/bees = rand(2, 10) - for(var/i, i <= bees, i++) - var/N = rand(1, 4) - var/image/I = image(icon='icons/mob/animal.dmi',icon_state="bee_[N]", pixel_x = rand(-8, 8), pixel_y = rand(-8, 8)) - overlays += I - - //update_bees() - -/mob/living/simple_animal/hostile/poison/bees/death() - ..() - ghostize() - qdel(src) - return - -/*/mob/living/simple_animal/hostile/poison/bees/Life() - ..() - - update_bees() - -/mob/living/simple_animal/hostile/poison/bees/proc/update_bees() - while(overlays.len != health-1) //how many bees do we have in the swarm? - var/N = rand(1, 4) - var/image/I = image(icon='icons/mob/animal.dmi',icon_state="bee_[N]", pixel_x = rand(-8, 8), pixel_y = rand(-8, 8)) - if(overlays.len < health-1) - overlays.Add(I) - if(overlays.len > health-1) - overlays.Remove(I) //REMOVING A RANDOM IMAGE FROM AN OVERLAYS LIST THAT DOES NOT CONTAIN THAT IMAGE - poison_per_bite = health * 0.5 //each bee is half a toxin reagent //WHAT A GREAT FUCKING PLAN - if(health > 1) - desc = "A buzzy swarm of [health] poisonous space bees, renowned for their aggressiveness" - else - desc = "Although now lonely, this single space bee is still poisonous and very angry at you."*///NOVEL IDEA: INFINITE LOOP IMPLEMENTATION diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 15ea3a5343f..43bdd538125 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -831,7 +831,8 @@ //All types that you can put into the grinder to transfer the reagents to the beaker. !Put all recipes above this.! /obj/item/weapon/reagent_containers/food/pill = list(), - /obj/item/weapon/reagent_containers/food = list() + /obj/item/weapon/reagent_containers/food = list(), + /obj/item/weapon/reagent_containers/honeycomb = list() ) var/list/blend_tags = list ( diff --git a/code/modules/reagents/newchem/food.dm b/code/modules/reagents/newchem/food.dm index ed65daca83a..6dd18d307f7 100644 --- a/code/modules/reagents/newchem/food.dm +++ b/code/modules/reagents/newchem/food.dm @@ -116,20 +116,17 @@ datum/reagent/vhfcs/on_mob_life(var/mob/living/M as mob) id = "honey" description = "A sweet substance produced by bees through partial digestion. Bee barf." reagent_state = LIQUID - color = "#CFCF1F" + color = "#d3a308" datum/reagent/honey/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom + if(!M) + M = holder.my_atom M.reagents.add_reagent("sugar", 0.4) + if(prob(20)) + M.heal_organ_damage(3,1) ..() return -datum/reagent/honey/reaction_turf(var/turf/T, var/volume) - src = null - if(volume >= 5) - new /obj/item/weapon/reagent_containers/food/snacks/honeycomb(T) - return - /datum/reagent/chocolate name = "Chocolate" id = "chocolate" @@ -605,4 +602,4 @@ datum/reagent/pepperoni/reaction_mob(var/mob/living/M, var/method=TOUCH, var/vol var/mob/living/carbon/human/H = M if(!H.heart_attack) H.heart_attack = 1 - ..() \ No newline at end of file + ..() diff --git a/code/modules/reagents/newchem/other.dm b/code/modules/reagents/newchem/other.dm index 7cd45d056d3..c26d8bbe983 100644 --- a/code/modules/reagents/newchem/other.dm +++ b/code/modules/reagents/newchem/other.dm @@ -386,4 +386,22 @@ datum/reagent/triplepiss id = "triplepiss" description = "Ewwwwwwwww." reagent_state = LIQUID - color = "#857400" \ No newline at end of file + color = "#857400" + +/datum/reagent/royal_bee_jelly + name = "royal bee jelly" + id = "royal_bee_jelly" + description = "Royal Bee Jelly, if injected into a Queen Space Bee said bee will split into two bees." + color = "#00ff80" + +/datum/reagent/royal_bee_jelly/on_mob_life(mob/living/M) + if(prob(2)) + M.say(pick("Bzzz...","BZZ BZZ","Bzzzzzzzzzzz...")) + ..() + +/datum/chemical_reaction/royal_bee_jelly + name = "royal bee jelly" + id = "royal_bee_jelly" + result = "royal_bee_jelly" + required_reagents = list("mutagen" = 10, "honey" = 40) + result_amount = 5 \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index 190b02c60d7..457f473c8bb 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -33,7 +33,6 @@ /obj/machinery/iv_drip, /obj/machinery/computer/pandemic, /obj/machinery/disposal, - /obj/machinery/apiary, /mob/living/simple_animal/cow, /mob/living/simple_animal/hostile/retaliate/goat, /obj/machinery/sleeper, diff --git a/icons/mob/bees.dmi b/icons/mob/bees.dmi new file mode 100644 index 00000000000..5d9bfea48b6 Binary files /dev/null and b/icons/mob/bees.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 38ce685a266..a67d328271e 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index c640d20334f..844d1b39b69 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/apiary_bees.dmi b/icons/obj/apiary_bees.dmi new file mode 100644 index 00000000000..df4cb0a0ac3 Binary files /dev/null and b/icons/obj/apiary_bees.dmi differ diff --git a/icons/obj/apiary_bees_etc.dmi b/icons/obj/apiary_bees_etc.dmi deleted file mode 100644 index de97e1a715a..00000000000 Binary files a/icons/obj/apiary_bees_etc.dmi and /dev/null differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index db2b15697bb..fafdcb56031 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index cd6ae3095a0..6b2732f13ed 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/hydroponics_machines.dmi b/icons/obj/hydroponics_machines.dmi index 1cc2998c531..cb3d548a6d9 100644 Binary files a/icons/obj/hydroponics_machines.dmi and b/icons/obj/hydroponics_machines.dmi differ diff --git a/paradise.dme b/paradise.dme index 634961f41aa..cf16539e450 100644 --- a/paradise.dme +++ b/paradise.dme @@ -474,7 +474,6 @@ #include "code\game\machinery\atmo_control.dm" #include "code\game\machinery\autolathe.dm" #include "code\game\machinery\Beacon.dm" -#include "code\game\machinery\bees_items.dm" #include "code\game\machinery\biogenerator.dm" #include "code\game\machinery\buttons.dm" #include "code\game\machinery\cell_charger.dm" @@ -1304,11 +1303,14 @@ #include "code\modules\hydroponics\seed_mobs.dm" #include "code\modules\hydroponics\seed_packets.dm" #include "code\modules\hydroponics\seed_storage.dm" +#include "code\modules\hydroponics\beekeeping\beebox.dm" +#include "code\modules\hydroponics\beekeeping\beekeeper_suit.dm" +#include "code\modules\hydroponics\beekeeping\honey_frame.dm" +#include "code\modules\hydroponics\beekeeping\honeycomb.dm" #include "code\modules\hydroponics\spreading\spreading.dm" #include "code\modules\hydroponics\spreading\spreading_growth.dm" #include "code\modules\hydroponics\spreading\spreading_response.dm" #include "code\modules\hydroponics\trays\tray.dm" -#include "code\modules\hydroponics\trays\tray_apiary.dm" #include "code\modules\hydroponics\trays\tray_process.dm" #include "code\modules\hydroponics\trays\tray_reagents.dm" #include "code\modules\hydroponics\trays\tray_soil.dm" @@ -1531,7 +1533,6 @@ #include "code\modules\mob\living\silicon\robot\drone\drone_items.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_manufacturer.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_say.dm" -#include "code\modules\mob\living\simple_animal\bees.dm" #include "code\modules\mob\living\simple_animal\constructs.dm" #include "code\modules\mob\living\simple_animal\corpse.dm" #include "code\modules\mob\living\simple_animal\parrot.dm" @@ -1568,6 +1569,7 @@ #include "code\modules\mob\living\simple_animal\hostile\alien.dm" #include "code\modules\mob\living\simple_animal\hostile\bat.dm" #include "code\modules\mob\living\simple_animal\hostile\bear.dm" +#include "code\modules\mob\living\simple_animal\hostile\bees.dm" #include "code\modules\mob\living\simple_animal\hostile\carp.dm" #include "code\modules\mob\living\simple_animal\hostile\creature.dm" #include "code\modules\mob\living\simple_animal\hostile\faithless.dm" @@ -1581,7 +1583,6 @@ #include "code\modules\mob\living\simple_animal\hostile\mining_mobs.dm" #include "code\modules\mob\living\simple_animal\hostile\mushroom.dm" #include "code\modules\mob\living\simple_animal\hostile\pirate.dm" -#include "code\modules\mob\living\simple_animal\hostile\poison_bees.dm" #include "code\modules\mob\living\simple_animal\hostile\russian.dm" #include "code\modules\mob\living\simple_animal\hostile\spaceworms.dm" #include "code\modules\mob\living\simple_animal\hostile\statue.dm"