From 9bde25863fdae803ae56b9ec1bdcdec37a7a358e Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Sun, 15 Sep 2013 23:27:55 -0400 Subject: [PATCH] Revert "Had to disable bees TEMPORARILY because string limit" This reverts commit 89780436fae0b8b7c609fcd275e3c53d718376e8. --- code/datums/supplypacks.dm | 3 +-- code/game/machinery/hydroponics.dm | 3 +-- code/game/machinery/vending.dm | 4 +--- code/game/objects/items/stacks/sheets/sheet_types.dm | 3 +-- .../structures/crates_lockers/closets/secure/hydroponics.dm | 2 +- code/modules/reagents/reagent_containers/glass.dm | 2 +- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 5b0a8661e69..b3b03e6ac26 100755 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -979,7 +979,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee containername = "Atmospheric circulator crate" group = "Engineering" access = access_engine -/* + /datum/supply_packs/bee_keeper name = "Beekeeping Crate" contains = list(/obj/item/beezeez, @@ -994,4 +994,3 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee containername = "Beekeeping crate" access = access_hydroponics group = "Hydroponics" -*/ \ No newline at end of file diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index e556611db39..a0f8c371e41 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -769,7 +769,6 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) if(istype(src, /obj/machinery/hydroponics/soil)) user << "You clear up the [src]!" del(src) -/* else if(istype(O, /obj/item/apiary)) if(planted) user << "\red The hydroponics tray is already occupied!" @@ -781,7 +780,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) A.icon = src.icon A.icon_state = src.icon_state A.hydrotray_type = src.type - del(src)*/ + del(src) return diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 9a9c5ffbf44..e9396fda0ce 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -760,12 +760,10 @@ product_ads = "We like plants!;Don't you want some?;The greenest thumbs ever.;We like big plants.;Soft soil..." icon_state = "nutri" icon_deny = "nutri-deny" - products = list(/obj/item/nutrient/ez = 35,/obj/item/nutrient/l4z = 25,/obj/item/nutrient/rh = 15,/obj/item/weapon/pestspray = 20, + products = list(/obj/item/beezeez = 45,/obj/item/nutrient/ez = 35,/obj/item/nutrient/l4z = 25,/obj/item/nutrient/rh = 15,/obj/item/weapon/pestspray = 20, /obj/item/weapon/reagent_containers/syringe = 5,/obj/item/weapon/storage/bag/plants = 5) contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5) -///obj/item/beezeez = 45, - /obj/machinery/vending/hydroseeds name = "MegaSeed Servitor" desc = "When you need seeds fast!" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index c097a3c36ac..e35bae22499 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -131,9 +131,8 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \ new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1), \ 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("apiary", /obj/item/apiary, 10, time = 25, one_per_turf = 0, on_floor = 0), \ - /obj/item/stack/sheet/wood name = "wooden planks" 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 3fe05730fb8..a8024b0cd50 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -23,5 +23,5 @@ new /obj/item/clothing/head/greenbandana(src) new /obj/item/weapon/minihoe(src) new /obj/item/weapon/hatchet(src) -// new /obj/item/weapon/bee_net(src) + new /obj/item/weapon/bee_net(src) return \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 5ed4fc8fb04..25d8c34e233 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -32,7 +32,7 @@ /obj/machinery/iv_drip, /obj/machinery/disease2/incubator, /obj/machinery/disposal, -// /obj/machinery/apiary, + /obj/machinery/apiary, /mob/living/simple_animal/cow, /mob/living/simple_animal/hostile/retaliate/goat, /obj/machinery/computer/centrifuge )