From 066482de93c40f27cfd4d97fea93b830d52ca4ff Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 13 Feb 2015 05:53:45 +1030 Subject: [PATCH] Readds predefined ambrosia items. --- baystation12.dme | 1 + code/game/objects/items/weapons/gift_wrappaper.dm | 2 ++ code/modules/hydroponics/grown_predefined.dm | 5 +++++ code/modules/mining/abandonedcrates.dm | 1 + 4 files changed, 9 insertions(+) create mode 100644 code/modules/hydroponics/grown_predefined.dm diff --git a/baystation12.dme b/baystation12.dme index b6039e5402b..2430bdec36f 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -966,6 +966,7 @@ #include "code\modules\hydroponics\_hydro_setup.dm" #include "code\modules\hydroponics\grown.dm" #include "code\modules\hydroponics\grown_inedible.dm" +#include "code\modules\hydroponics\grown_predefined.dm" #include "code\modules\hydroponics\seed.dm" #include "code\modules\hydroponics\seed_controller.dm" #include "code\modules\hydroponics\seed_datums.dm" diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 8127d9736d8..8ed63b88aa3 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -99,6 +99,8 @@ /obj/item/toy/prize/seraph, /obj/item/toy/spinningtoy, /obj/item/toy/sword, + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, /obj/item/device/paicard, /obj/item/device/violin, /obj/item/weapon/storage/belt/utility/full, diff --git a/code/modules/hydroponics/grown_predefined.dm b/code/modules/hydroponics/grown_predefined.dm new file mode 100644 index 00000000000..e44025de7b3 --- /dev/null +++ b/code/modules/hydroponics/grown_predefined.dm @@ -0,0 +1,5 @@ +/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris + plantname = "ambrosia" + +/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus + plantname = "ambrosiadeus" \ No newline at end of file diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index 7f3a5033d57..c26c2eb9cd6 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -25,6 +25,7 @@ if(1 to 5) // Common things go, 5% new/obj/item/weapon/reagent_containers/food/drinks/bottle/rum(src) new/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey(src) + new/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus(src) new/obj/item/weapon/flame/lighter/zippo(src) if(6 to 10) new/obj/item/weapon/pickaxe/drill(src)