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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697

Browse Source
This commit is contained in:
Ghommie
2020-05-01 21:49:52 +02:00
parent 0c1c879fb4 44f9773ccf
commit 54e76e8ffb
268 changed files with 5984 additions and 7619 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/biogenerator_designs.dm
+22 -52
View File
@@ -2,6 +2,9 @@
///////Biogenerator Designs ///////
///////////////////////////////////
//Please be wary to not add inorganic items to the results such as generic glass bottles and metal.
//as they kind of defeat the design of this feature.
/datum/design/milk
name = "10u Milk"
id = "milk"
@@ -18,22 +21,6 @@
make_reagents = list(/datum/reagent/consumable/cream = 10)
category = list("initial","Food")
/datum/design/milk_carton
name = "Milk Carton"
id = "milk_carton"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass = 100)
build_path = /obj/item/reagent_containers/food/condiment/milk
category = list("initial","Food")
/datum/design/cream_carton
name = "Cream Carton"
id = "cream_carton"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass = 300)
build_path = /obj/item/reagent_containers/food/drinks/bottle/cream
category = list("initial","Food")
/datum/design/black_pepper
name = "10u Black Pepper"
id = "black_pepper"
@@ -42,15 +29,6 @@
make_reagents = list(/datum/reagent/consumable/blackpepper = 10)
category = list("initial","Food")
/datum/design/pepper_mill
name = "Pepper Mill"
id = "pepper_mill"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass = 50)
build_path = /obj/item/reagent_containers/food/condiment/peppermill
make_reagents = list()
category = list("initial","Food")
/datum/design/enzyme
name = "10u Universal Enzyme"
id = "enzyme"
@@ -59,14 +37,6 @@
make_reagents = list(/datum/reagent/consumable/enzyme = 10)
category = list("initial","Food")
/datum/design/flour_sack
name = "Flour Sack"
id = "flour_sack"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass = 150)
build_path = /obj/item/reagent_containers/food/condiment/flour
category = list("initial","Food")
/datum/design/monkey_cube
name = "Monkey Cube"
id = "mcube"
@@ -84,43 +54,43 @@
category = list("initial", "Food")
/datum/design/ez_nut
name = "E-Z Nutrient"
name = "10u E-Z Nutrient"
id = "ez_nut"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass = 10)
build_path = /obj/item/reagent_containers/glass/bottle/nutrient/ez
materials = list(/datum/material/biomass = 2)
make_reagents = list(/datum/reagent/plantnutriment/eznutriment = 10)
category = list("initial","Botany Chemicals")
/datum/design/l4z_nut
name = "Left 4 Zed"
name = "10u Left 4 Zed"
id = "l4z_nut"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass = 20)
build_path = /obj/item/reagent_containers/glass/bottle/nutrient/l4z
materials = list(/datum/material/biomass = 4)
make_reagents = list(/datum/reagent/plantnutriment/left4zednutriment = 10)
category = list("initial","Botany Chemicals")
/datum/design/rh_nut
name = "Robust Harvest"
name = "10u Robust Harvest"
id = "rh_nut"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass = 25)
build_path = /obj/item/reagent_containers/glass/bottle/nutrient/rh
materials = list(/datum/material/biomass = 5)
make_reagents = list(/datum/reagent/plantnutriment/robustharvestnutriment = 10)
category = list("initial","Botany Chemicals")
/datum/design/weed_killer
name = "Weed Killer"
id = "weed_killer"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass = 50)
build_path = /obj/item/reagent_containers/glass/bottle/killer/weedkiller
materials = list(/datum/material/biomass = 10)
make_reagents = list(/datum/reagent/toxin/plantbgone/weedkiller = 10)
category = list("initial","Botany Chemicals")
/datum/design/pest_spray
name = "Pest Killer"
id = "pest_spray"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass = 50)
build_path = /obj/item/reagent_containers/glass/bottle/killer/pestkiller
materials = list(/datum/material/biomass = 10)
make_reagents = list(/datum/reagent/toxin/pestkiller = 10)
category = list("initial","Botany Chemicals")
/datum/design/ammonia
@@ -139,13 +109,13 @@
make_reagents = list(/datum/reagent/saltpetre = 10)
category = list("initial","Botany Chemicals")
/datum/design/botany_bottle
name = "Empty Bottle"
id = "botany_bottle"
/datum/design/empty_carton
name = "Small Empty Carton Box"
id = "empty_carton"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass = 5)
build_path = /obj/item/reagent_containers/glass/bottle/nutrient/empty
category = list("initial", "Botany Chemicals")
materials = list(/datum/material/biomass = 15)
build_path = /obj/item/reagent_containers/food/drinks/bottle/bio_carton
category = list("initial", "Organic Materials")
/datum/design/cloth
name = "Roll of Cloth"
code/modules/research/designs/nanite_designs.dm
+7 -2
View File
@@ -529,7 +529,6 @@
////////////////////NANITE PROTOCOLS//////////////////////////////////////
//Note about the category name: The UI cuts the last 8 characters from the category name to remove the " Nanites" in the other categories
//Because of this, Protocols was getting cut down to "P", so i had to add some padding
/*
/datum/design/nanites/kickstart
name = "Kickstart Protocol"
desc = "Replication Protocol: the nanites focus on early growth, heavily boosting replication rate for a few minutes after the initial implantation."
@@ -557,4 +556,10 @@
id = "offline_nanites"
program_type = /datum/nanite_program/protocol/offline
category = list("Protocols_Nanites")
*/
/datum/design/nanites/synergy
name = "Synergy Protocol"
desc = "Replication Protocol: the nanites syncronize their tasks and processes within a host, leading to an increase in replication speed proportional to the current nanite volume."
id = "synergy_nanites"
program_type = /datum/nanite_program/protocol/synergy
category = list("Protocols_Nanites")