shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

a

Browse Source
This commit is contained in:
Ghommie
2019-12-28 23:02:28 +01:00
parent 21cfb2914b
commit 37441437d1
91 changed files with 873 additions and 1522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/beekeeping/beebox.dm
+2 -2
View File
@@ -65,7 +65,7 @@
var/datum/reagent/R = null
if(random_reagent)
R = pick(subtypesof(/datum/reagent))
R = GLOB.chemical_reagents_list[initial(R.id)]
R = GLOB.chemical_reagents_list[R]
queen_bee = new(src)
queen_bee.beehome = src
@@ -95,7 +95,7 @@
bee_resources = max(bee_resources-BEE_RESOURCE_HONEYCOMB_COST, 0)
var/obj/item/reagent_containers/honeycomb/HC = new(src)
if(queen_bee.beegent)
HC.set_reagent(queen_bee.beegent.id)
HC.set_reagent(queen_bee.beegent.type)
honeycombs += HC
if(bees.len < get_max_bees())
code/modules/hydroponics/grown/ambrosia.dm
+3 -3
View File
@@ -25,7 +25,7 @@
icon_dead = "ambrosia-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/ambrosia/deus)
reagents_add = list(/datum/reagent/drug/space_drugs = 0.15, "bicaridine" = 0.1, "kelotane" = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/toxin = 0.1)
reagents_add = list(/datum/reagent/drug/space_drugs = 0.15, /datum/reagent/medicine/bicaridine = 0.1, /datum/reagent/medicine/kelotane = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/toxin = 0.1)
/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris
seed = /obj/item/seeds/ambrosia
@@ -42,7 +42,7 @@
plantname = "Ambrosia Deus"
product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus
mutatelist = list(/obj/item/seeds/ambrosia/gaia)
reagents_add = list(/datum/reagent/medicine/omnizine = 0.15, "synaptizine" = 0.15, /datum/reagent/drug/space_drugs = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
reagents_add = list(/datum/reagent/medicine/omnizine = 0.15, /datum/reagent/medicine/synaptizine = 0.15, /datum/reagent/drug/space_drugs = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
rarity = 40
/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus
@@ -62,7 +62,7 @@
plantname = "Ambrosia Gaia"
product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia
mutatelist = list(/obj/item/seeds/ambrosia/deus)
reagents_add = list("earthsblood" = 0.05, /datum/reagent/consumable/nutriment = 0.06, /datum/reagent/consumable/nutriment/vitamin = 0.05)
reagents_add = list(/datum/reagent/medicine/earthsblood = 0.05, /datum/reagent/consumable/nutriment = 0.06, /datum/reagent/consumable/nutriment/vitamin = 0.05)
rarity = 30 //These are some pretty good plants right here
genes = list()
weed_rate = 4
code/modules/hydroponics/grown/apple.dm
+2 -2
View File
@@ -24,9 +24,9 @@
filling_color = "#FF4500"
bitesize = 100 // Always eat the apple in one bite
foodtype = FRUIT
juice_results = list("applejuice" = 0)
juice_results = list(/datum/reagent/consumable/applejuice = 0)
tastes = list("apple" = 1)
distill_reagent = "hcider"
distill_reagent = /datum/reagent/consumable/ethanol/hcider
// Gold Apple
/obj/item/seeds/apple/gold
code/modules/hydroponics/grown/banana.dm
+6 -6
View File
@@ -24,8 +24,8 @@
filling_color = "#FFFF00"
bitesize = 5
foodtype = FRUIT
juice_results = list("banana" = 0)
distill_reagent = "bananahonk"
juice_results = list(/datum/reagent/consumable/banana = 0)
distill_reagent = /datum/reagent/consumable/ethanol/bananahonk
/obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -70,7 +70,7 @@
product = /obj/item/reagent_containers/food/snacks/grown/banana/mime
growthstages = 4
mutatelist = list()
reagents_add = list("nothing" = 0.1, "mutetoxin" = 0.1, /datum/reagent/consumable/nutriment = 0.02)
reagents_add = list(/datum/reagent/consumable/nothing = 0.1, /datum/reagent/toxin/mutetoxin = 0.1, /datum/reagent/consumable/nutriment = 0.02)
rarity = 15
/obj/item/reagent_containers/food/snacks/grown/banana/mime
@@ -80,7 +80,7 @@
icon_state = "mimana"
trash = /obj/item/grown/bananapeel/mimanapeel
filling_color = "#FFFFEE"
distill_reagent = "silencer"
distill_reagent = /datum/reagent/consumable/ethanol/silencer
/obj/item/grown/bananapeel/mimanapeel
seed = /obj/item/seeds/banana/mime
@@ -100,7 +100,7 @@
product = /obj/item/reagent_containers/food/snacks/grown/banana/bluespace
mutatelist = list()
genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/teleport, /datum/plant_gene/trait/repeated_harvest)
reagents_add = list("bluespace" = 0.2, /datum/reagent/consumable/banana = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.02)
reagents_add = list(/datum/reagent/bluespace = 0.2, /datum/reagent/consumable/banana = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.02)
rarity = 30
/obj/item/reagent_containers/food/snacks/grown/banana/bluespace
@@ -139,7 +139,7 @@
icon_state = "exoticbanana"
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
foodtype = GROSS | MEAT | RAW | FRUIT
grind_results = list(/datum/reagent/blood = 20, "liquidgibs" = 5)
grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5)
var/awakening = 0
/obj/item/reagent_containers/food/snacks/grown/banana/banana_spider_spawnable/attack_self(mob/user)
code/modules/hydroponics/grown/beans.dm
+3 -3
View File
@@ -15,7 +15,7 @@
icon_dead = "soybean-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/soya/koi)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, "cooking_oil" = 0.03) //Vegetable oil!
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/consumable/cooking_oil = 0.03) //Vegetable oil!
/obj/item/reagent_containers/food/snacks/grown/soybeans
seed = /obj/item/seeds/soya
@@ -26,7 +26,7 @@
filling_color = "#F0E68C"
bitesize_mod = 2
foodtype = VEGETABLES
grind_results = list("soymilk" = 0)
grind_results = list(/datum/reagent/consumable/soymilk = 0)
tastes = list("soy" = 1)
wine_power = 20
@@ -40,7 +40,7 @@
product = /obj/item/reagent_containers/food/snacks/grown/koibeans
potency = 10
mutatelist = list()
reagents_add = list("carpotoxin" = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
reagents_add = list(/datum/reagent/toxin/carpotoxin = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
rarity = 20
/obj/item/reagent_containers/food/snacks/grown/koibeans
code/modules/hydroponics/grown/berries.dm
+5 -5
View File
@@ -28,7 +28,7 @@
foodtype = FRUIT
juice_results = list(/datum/reagent/consumable/berryjuice = 0)
tastes = list("berry" = 1)
distill_reagent = "gin"
distill_reagent = /datum/reagent/consumable/ethanol/gin
// Poison Berries
/obj/item/seeds/berry/poison
@@ -39,7 +39,7 @@
plantname = "Poison-Berry Bush"
product = /obj/item/reagent_containers/food/snacks/grown/berries/poison
mutatelist = list(/obj/item/seeds/berry/death)
reagents_add = list(/datum/reagent/toxin/cyanide = 0.15, "tirizene" = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
reagents_add = list(/datum/reagent/toxin/cyanide = 0.15, /datum/reagent/toxin/staminatoxin = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
rarity = 10 // Mildly poisonous berries are common in reality
/obj/item/reagent_containers/food/snacks/grown/berries/poison
@@ -49,7 +49,7 @@
icon_state = "poisonberrypile"
filling_color = "#C71585"
foodtype = FRUIT | TOXIC
juice_results = list("poisonberryjuice" = 0)
juice_results = list(/datum/reagent/consumable/poisonberryjuice = 0)
tastes = list("poison-berry" = 1)
distill_reagent = null
wine_power = 35
@@ -220,7 +220,7 @@
foodtype = FRUIT
juice_results = list(/datum/reagent/consumable/grapejuice = 0)
tastes = list("grape" = 1)
distill_reagent = "wine"
distill_reagent = /datum/reagent/consumable/ethanol/wine
// Green Grapes
/obj/item/seeds/grape/green
@@ -240,7 +240,7 @@
icon_state = "greengrapes"
filling_color = "#7FFF00"
tastes = list("green grape" = 1)
distill_reagent = "cognac"
distill_reagent = /datum/reagent/consumable/ethanol/cognac
// Strawberry
/obj/item/seeds/strawberry
code/modules/hydroponics/grown/cereals.dm
+3 -3
View File
@@ -24,7 +24,7 @@
foodtype = GRAIN
grind_results = list(/datum/reagent/consumable/flour = 0)
tastes = list("wheat" = 1)
distill_reagent = "beer"
distill_reagent = /datum/reagent/consumable/ethanol/beer
// Oat
/obj/item/seeds/wheat/oat
@@ -47,7 +47,7 @@
foodtype = GRAIN
grind_results = list(/datum/reagent/consumable/flour = 0)
tastes = list("oat" = 1)
distill_reagent = "ale"
distill_reagent = /datum/reagent/consumable/ethanol/ale
// Rice
/obj/item/seeds/wheat/rice
@@ -71,7 +71,7 @@
foodtype = GRAIN
grind_results = list(/datum/reagent/consumable/rice = 0)
tastes = list("rice" = 1)
distill_reagent = "sake"
distill_reagent = /datum/reagent/consumable/ethanol/sake
//Meatwheat - grows into synthetic meat
/obj/item/seeds/wheat/meat
code/modules/hydroponics/grown/citrus.dm
+2 -2
View File
@@ -79,7 +79,7 @@
icon_state = "orange"
filling_color = "#FFA500"
juice_results = list(/datum/reagent/consumable/orangejuice = 0)
distill_reagent = "triple_sec"
distill_reagent = /datum/reagent/consumable/ethanol/triple_sec
//3D Orange
@@ -107,7 +107,7 @@
icon_state = "orang"
filling_color = "#FFA500"
juice_results = list(/datum/reagent/consumable/orangejuice = 0)
distill_reagent = "triple_sec"
distill_reagent = /datum/reagent/consumable/ethanol/triple_sec
tastes = list("polygons" = 1, "oranges" = 1)
/obj/item/reagent_containers/food/snacks/grown/citrus/orange_3d/pickup(mob/user)
code/modules/hydroponics/grown/cocoa_vanilla.dm
+3 -2
View File
@@ -27,7 +27,7 @@
bitesize_mod = 2
foodtype = FRUIT
tastes = list("cocoa" = 1)
distill_reagent = "creme_de_cacao"
distill_reagent = /datum/reagent/consumable/ethanol/creme_de_cacao
// Vanilla Pod
/obj/item/seeds/cocoapod/vanillapod
@@ -49,7 +49,7 @@
filling_color = "#FFD700"
foodtype = FRUIT
tastes = list("vanilla" = 1)
distill_reagent = "vanilla" //Takes longer, but you can get even more vanilla from it.
distill_reagent = /datum/reagent/consumable/vanilla //Takes longer, but you can get even more vanilla from it.
/obj/item/seeds/cocoapod/bungotree
name = "pack of bungo tree seeds"
@@ -79,6 +79,7 @@
trash = /obj/item/reagent_containers/food/snacks/grown/bungopit
filling_color = "#E8C22F"
foodtype = FRUIT
juice_results = list(/datum/reagent/consumable/bungojuice = 0)
tastes = list("bungo" = 2, "tropical fruitiness" = 1)
distill_reagent = null
code/modules/hydroponics/grown/corn.dm
+1 -1
View File
@@ -27,7 +27,7 @@
foodtype = VEGETABLES
juice_results = list(/datum/reagent/consumable/corn_starch = 0)
tastes = list("corn" = 1)
distill_reagent = "whiskey"
distill_reagent = /datum/reagent/consumable/ethanol/whiskey
/obj/item/grown/corncob
name = "corn cob"
code/modules/hydroponics/grown/eggplant.dm
+1 -1
View File
@@ -47,4 +47,4 @@
filling_color = "#F8F8FF"
bitesize_mod = 2
foodtype = MEAT
distill_reagent = "eggnog"
distill_reagent = /datum/reagent/consumable/ethanol/eggnog
code/modules/hydroponics/grown/flowers.dm
+3 -3
View File
@@ -27,7 +27,7 @@
bitesize_mod = 3
tastes = list("sesame seeds" = 1)
foodtype = VEGETABLES | GROSS
distill_reagent = "vermouth"
distill_reagent = /datum/reagent/consumable/ethanol/vermouth
// Lily
/obj/item/seeds/poppy/lily
@@ -130,7 +130,7 @@
slot_flags = ITEM_SLOT_HEAD
filling_color = "#E6E6FA"
bitesize_mod = 3
distill_reagent = "vermouth"
distill_reagent = /datum/reagent/consumable/ethanol/vermouth
// Sunflower
/obj/item/seeds/sunflower
@@ -195,7 +195,7 @@
slot_flags = ITEM_SLOT_HEAD
filling_color = "#E6E6FA"
bitesize_mod = 2
distill_reagent = "absinthe" //It's made from flowers.
distill_reagent = /datum/reagent/consumable/ethanol/absinthe //It's made from flowers.
tastes = list("glowbugs" = 1)
// Novaflower
code/modules/hydroponics/grown/misc.dm
+1 -1
View File
@@ -153,7 +153,7 @@
filling_color = "#FFD700"
bitesize_mod = 2
foodtype = VEGETABLES | SUGAR
distill_reagent = "rum"
distill_reagent = /datum/reagent/consumable/ethanol/rum
// Gatfruit
/obj/item/seeds/gatfruit
code/modules/hydroponics/grown/mushrooms.dm
+1 -1
View File
@@ -133,7 +133,7 @@
desc = "<I>Plumus Hellmus</I>: Plump, soft and s-so inviting~"
icon_state = "plumphelmet"
filling_color = "#9370DB"
distill_reagent = "manlydorf"
distill_reagent = /datum/reagent/consumable/ethanol/manly_dorf
// Walking Mushroom
/obj/item/seeds/plump/walkingmushroom
code/modules/hydroponics/grown/potato.dm
+2 -2
View File
@@ -27,7 +27,7 @@
bitesize = 100
foodtype = VEGETABLES
juice_results = list(/datum/reagent/consumable/potato_juice = 0)
distill_reagent = "vodka"
distill_reagent = /datum/reagent/consumable/ethanol/vodka
/obj/item/reagent_containers/food/snacks/grown/potato/wedges
name = "potato wedges"
@@ -64,4 +64,4 @@
name = "sweet potato"
desc = "It's sweet."
icon_state = "sweetpotato"
distill_reagent = "sbiten"
distill_reagent = /datum/reagent/consumable/ethanol/sbiten
code/modules/hydroponics/grown/tea_coffee.dm
+1 -1
View File
@@ -90,7 +90,7 @@
bitesize_mod = 2
dry_grind = TRUE
grind_results = list(/datum/reagent/toxin/coffeepowder = 0)
distill_reagent = "kahlua"
distill_reagent = /datum/reagent/consumable/ethanol/kahlua
// Coffee Robusta
/obj/item/seeds/coffee/robusta
code/modules/hydroponics/grown/tobacco.dm
+1 -1
View File
@@ -21,7 +21,7 @@
desc = "Dry them out to make some smokes."
icon_state = "tobacco_leaves"
filling_color = "#008000"
distill_reagent = "creme_de_menthe" //Menthol, I guess.
distill_reagent = /datum/reagent/consumable/ethanol/creme_de_menthe //Menthol, I guess.
// Space Tobacco
/obj/item/seeds/tobacco/space
code/modules/hydroponics/grown/tomato.dm
+4 -4
View File
@@ -25,7 +25,7 @@
foodtype = FRUIT
grind_results = list(/datum/reagent/consumable/ketchup = 0)
juice_results = list(/datum/reagent/consumable/tomatojuice = 0)
distill_reagent = "enzyme"
distill_reagent = /datum/reagent/consumable/enzyme
// Blood Tomato
/obj/item/seeds/tomato/blood
@@ -48,7 +48,7 @@
filling_color = "#FF0000"
foodtype = FRUIT | GROSS
grind_results = list(/datum/reagent/consumable/ketchup = 0, /datum/reagent/blood = 0)
distill_reagent = "bloodymary"
distill_reagent = /datum/reagent/consumable/ethanol/bloody_mary
// Blue Tomato
/obj/item/seeds/tomato/blue
@@ -72,7 +72,7 @@
icon_state = "bluetomato"
splat_type = /obj/effect/decal/cleanable/oil
filling_color = "#0000FF"
distill_reagent = "laughter"
distill_reagent = /datum/reagent/consumable/laughter
// Bluespace Tomato
/obj/item/seeds/tomato/blue/bluespace
@@ -120,7 +120,7 @@
icon_state = "killertomato"
var/awakening = 0
filling_color = "#FF0000"
distill_reagent = "demonsblood"
distill_reagent = /datum/reagent/consumable/ethanol/demonsblood
/obj/item/reagent_containers/food/snacks/grown/tomato/killer/attack(mob/M, mob/user, def_zone)
if(awakening)
code/modules/hydroponics/hydroitemdefines.dm
+7 -7
View File
@@ -24,7 +24,7 @@
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
volume = 100
list_reagents = list("weedkiller" = 100)
list_reagents = list(/datum/reagent/toxin/plantbgone/weedkiller = 100)
/obj/item/reagent_containers/spray/weedspray/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -39,7 +39,7 @@
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
volume = 100
list_reagents = list("pestkiller" = 100)
list_reagents = list(/datum/reagent/toxin/pestkiller = 100)
/obj/item/reagent_containers/spray/pestspray/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -164,17 +164,17 @@
/obj/item/reagent_containers/glass/bottle/nutrient/ez
name = "bottle of E-Z-Nutrient"
desc = "Contains a fertilizer that causes mild mutations with each harvest."
list_reagents = list("eznutriment" = 50)
list_reagents = list(/datum/reagent/plantnutriment/eznutriment = 50)
/obj/item/reagent_containers/glass/bottle/nutrient/l4z
name = "bottle of Left 4 Zed"
desc = "Contains a fertilizer that limits plant yields to no more than one and causes significant mutations in plants."
list_reagents = list("left4zednutriment" = 50)
list_reagents = list(/datum/reagent/plantnutriment/left4zednutriment = 50)
/obj/item/reagent_containers/glass/bottle/nutrient/rh
name = "bottle of Robust Harvest"
desc = "Contains a fertilizer that increases the yield of a plant by 30% while causing no mutations."
list_reagents = list("robustharvestnutriment" = 50)
list_reagents = list(/datum/reagent/plantnutriment/robustharvestnutriment = 50)
/obj/item/reagent_containers/glass/bottle/nutrient/empty
name = "bottle"
@@ -187,9 +187,9 @@
/obj/item/reagent_containers/glass/bottle/killer/weedkiller
name = "bottle of weed killer"
desc = "Contains a herbicide."
list_reagents = list("weedkiller" = 50)
list_reagents = list(/datum/reagent/toxin/plantbgone/weedkiller = 50)
/obj/item/reagent_containers/glass/bottle/killer/pestkiller
name = "bottle of pest spray"
desc = "Contains a pesticide."
list_reagents = list("pestkiller" = 50)
list_reagents = list(/datum/reagent/toxin/pestkiller = 50)
code/modules/hydroponics/plant_genes.dm
+1 -1
View File
@@ -129,7 +129,7 @@
name = "UNKNOWN"
var/datum/reagent/R = GLOB.chemical_reagents_list[reag_id]
if(R && R.id == reagent_id)
if(R && R.type == reagent_id)
name = R.name
/datum/plant_gene/reagent/New(reag_id = null, reag_rate = 0)