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

Merge branch 'master' into upstream-merge-29940

Browse Source
This commit is contained in:
LetterJay
2017-08-21 23:29:24 -05:00
committed by GitHub
parent 87b3df3069 b5e7f7f7fe
commit a0cf777040
364 changed files with 4317 additions and 3134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/biogenerator.dm
+4 -17
View File
@@ -7,6 +7,7 @@
anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 40
circuit = /obj/item/weapon/circuitboard/machine/biogenerator
var/processing = FALSE
var/obj/item/weapon/reagent_containers/glass/beaker = null
var/points = 0
@@ -18,17 +19,13 @@
var/list/show_categories = list("Food", "Botany Chemicals", "Leather and Cloth")
var/list/timesFiveCategories = list("Food", "Botany Chemicals")
/obj/machinery/biogenerator/New()
..()
/obj/machinery/biogenerator/Initialize()
. = ..()
files = new /datum/research/biogenerator(src)
create_reagents(1000)
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/biogenerator(null)
B.apply_default_parts(src)
/obj/machinery/biogenerator/Destroy()
if(beaker)
qdel(beaker)
beaker = null
QDEL_NULL(beaker)
return ..()
/obj/machinery/biogenerator/contents_explosion(severity, target)
@@ -43,16 +40,6 @@
update_icon()
updateUsrDialog()
/obj/item/weapon/circuitboard/machine/biogenerator
name = "Biogenerator (Machine Board)"
build_path = /obj/machinery/biogenerator
origin_tech = "programming=2;biotech=3;materials=3"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 1,
/obj/item/weapon/stock_parts/manipulator = 1,
/obj/item/stack/cable_coil = 1,
/obj/item/weapon/stock_parts/console_screen = 1)
/obj/machinery/biogenerator/RefreshParts()
var/E = 0
var/P = 0
code/modules/hydroponics/gene_modder.dm
+3 -31
View File
@@ -5,6 +5,7 @@
icon_state = "dnamod"
density = TRUE
anchored = TRUE
circuit = /obj/item/weapon/circuitboard/machine/plantgenes
var/obj/item/seeds/seed
var/obj/item/weapon/disk/plantgene/disk
@@ -22,21 +23,6 @@
var/min_wchance = 67
var/min_wrate = 10
/obj/machinery/plantgenes/New()
..()
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/plantgenes(null)
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/plantgenes
name = "Plant DNA Manipulator (Machine Board)"
build_path = /obj/machinery/plantgenes
origin_tech = "programming=3;biotech=3"
req_components = list(
/obj/item/weapon/stock_parts/manipulator = 1,
/obj/item/weapon/stock_parts/micro_laser = 1,
/obj/item/weapon/stock_parts/console_screen = 1,
/obj/item/weapon/stock_parts/scanning_module = 1)
/obj/machinery/plantgenes/RefreshParts() // Comments represent the max you can set per tier, respectively. seeds.dm [219] clamps these for us but we don't want to mislead the viewer.
for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
if(M.rating > 3)
@@ -421,23 +407,9 @@
seed.name = "experimental " + seed.name
seed.icon_state = "seed-x"
// Gene modder for seed vault ship, built with high tech alien parts.
/obj/machinery/plantgenes/seedvault/New()
..()
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/plantgenes/vault(null)
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/plantgenes/vault
name = "alien board (Plant DNA Manipulator)"
icon_state = "abductor_mod"
origin_tech = "programming=5;biotech=5"
// It wasn't made by actual abductors race, so no abductor tech here.
def_components = list(
/obj/item/weapon/stock_parts/manipulator = /obj/item/weapon/stock_parts/manipulator/femto,
/obj/item/weapon/stock_parts/micro_laser = /obj/item/weapon/stock_parts/micro_laser/quadultra,
/obj/item/weapon/stock_parts/scanning_module = /obj/item/weapon/stock_parts/scanning_module/triphasic)
/obj/machinery/plantgenes/seedvault
circuit = /obj/item/weapon/circuitboard/machine/plantgenes/vault
/*
* Plant DNA disk
code/modules/hydroponics/grown/ambrosia.dm
+1
View File
@@ -7,6 +7,7 @@
slot_flags = SLOT_HEAD
filling_color = "#008000"
bitesize_mod = 2
foodtype = VEGETABLES
// Ambrosia Vulgaris
/obj/item/seeds/ambrosia
code/modules/hydroponics/grown/apple.dm
+2
View File
@@ -23,6 +23,7 @@
icon_state = "apple"
filling_color = "#FF4500"
bitesize = 100 // Always eat the apple in one bite
foodtype = FRUIT
// Posioned Apple
/obj/item/seeds/apple/poisoned
@@ -33,6 +34,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned
seed = /obj/item/seeds/apple/poisoned
foodtype = FRUIT | TOXIC
// Gold Apple
/obj/item/seeds/apple/gold
code/modules/hydroponics/grown/banana.dm
+1
View File
@@ -23,6 +23,7 @@
trash = /obj/item/weapon/grown/bananapeel
filling_color = "#FFFF00"
bitesize = 5
foodtype = FRUIT
/obj/item/weapon/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>")
code/modules/hydroponics/grown/beans.dm
+3 -1
View File
@@ -25,6 +25,7 @@
icon_state = "soybeans"
filling_color = "#F0E68C"
bitesize_mod = 2
foodtype = VEGETABLES
// Koibean
/obj/item/seeds/soya/koi
@@ -45,4 +46,5 @@
desc = "Something about these seems fishy."
icon_state = "koibeans"
filling_color = "#F0E68C"
bitesize_mod = 2
bitesize_mod = 2
foodtype = VEGETABLES
code/modules/hydroponics/grown/berries.dm
+7
View File
@@ -25,6 +25,7 @@
gender = PLURAL
filling_color = "#FF00FF"
bitesize_mod = 2
foodtype = FRUIT
// Poison Berries
/obj/item/seeds/berry/poison
@@ -44,6 +45,7 @@
desc = "Taste so good, you could die!"
icon_state = "poisonberrypile"
filling_color = "#C71585"
foodtype = FRUIT | TOXIC
// Death Berries
/obj/item/seeds/berry/death
@@ -65,6 +67,7 @@
desc = "Taste so good, you could die!"
icon_state = "deathberrypile"
filling_color = "#708090"
foodtype = FRUIT | TOXIC
// Glow Berries
/obj/item/seeds/berry/glow
@@ -88,6 +91,7 @@
icon_state = "glowberrypile"
filling_color = "#7CFC00"
origin_tech = "plasmatech=6"
foodtype = FRUIT
// Cherries
/obj/item/seeds/cherry
@@ -117,6 +121,7 @@
gender = PLURAL
filling_color = "#FF0000"
bitesize_mod = 2
foodtype = FRUIT
// Blue Cherries
/obj/item/seeds/cherry/blue
@@ -137,6 +142,7 @@
icon_state = "bluecherry"
filling_color = "#6495ED"
bitesize_mod = 2
foodtype = FRUIT
// Grapes
/obj/item/seeds/grape
@@ -167,6 +173,7 @@
dried_type = /obj/item/weapon/reagent_containers/food/snacks/no_raisin/healthy
filling_color = "#FF1493"
bitesize_mod = 2
foodtype = FRUIT
// Green Grapes
/obj/item/seeds/grape/green
code/modules/hydroponics/grown/cannabis.dm
+1
View File
@@ -90,6 +90,7 @@
icon_state = "cannabis"
filling_color = "#00FF00"
bitesize_mod = 2
foodtype = VEGETABLES //i dont really know what else weed could be to be honest
/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/rainbow
code/modules/hydroponics/grown/cereals.dm
+4
View File
@@ -21,6 +21,7 @@
icon_state = "wheat"
filling_color = "#F0E68C"
bitesize_mod = 2
foodtype = GRAIN
// Oat
/obj/item/seeds/wheat/oat
@@ -40,6 +41,7 @@
icon_state = "oat"
filling_color = "#556B2F"
bitesize_mod = 2
foodtype = GRAIN
// Rice
/obj/item/seeds/wheat/rice
@@ -60,6 +62,7 @@
icon_state = "rice"
filling_color = "#FAFAD2"
bitesize_mod = 2
foodtype = GRAIN
//Meatwheat - grows into synthetic meat
/obj/item/seeds/wheat/meat
@@ -79,6 +82,7 @@
filling_color = rgb(150, 0, 0)
bitesize_mod = 2
seed = /obj/item/seeds/wheat/meat
foodtype = MEAT | GRAIN
/obj/item/weapon/reagent_containers/food/snacks/grown/meatwheat/attack_self(mob/living/user)
user.visible_message("<span class='notice'>[user] crushes [src] into meat.</span>", "<span class='notice'>You crush [src] into something that resembles meat.</span>")
code/modules/hydroponics/grown/chili.dm
+3
View File
@@ -25,6 +25,7 @@
icon_state = "chilipepper"
filling_color = "#FF0000"
bitesize_mod = 2
foodtype = VEGETABLES
// Ice Chili
/obj/item/seeds/chili/ice
@@ -49,6 +50,7 @@
filling_color = "#0000CD"
bitesize_mod = 2
origin_tech = "biotech=4"
foodtype = VEGETABLES
// Ghost Chili
/obj/item/seeds/chili/ghost
@@ -75,6 +77,7 @@
filling_color = "#F8F8FF"
bitesize_mod = 4
origin_tech = "biotech=4;magnets=5"
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user)
..()
code/modules/hydroponics/grown/citrus.dm
+2
View File
@@ -5,6 +5,7 @@
desc = "It's so sour, your face will twist."
icon_state = "lime"
bitesize_mod = 2
foodtype = FRUIT
// Lime
/obj/item/seeds/lime
@@ -104,6 +105,7 @@
desc = "Made for burning houses down."
icon_state = "firelemon"
bitesize_mod = 2
foodtype = FRUIT
/obj/item/weapon/reagent_containers/food/snacks/grown/firelemon/attack_self(mob/living/user)
var/area/A = get_area(user)
code/modules/hydroponics/grown/cocoa_vanilla.dm
+3 -1
View File
@@ -25,6 +25,7 @@
icon_state = "cocoapod"
filling_color = "#FFD700"
bitesize_mod = 2
foodtype = VEGETABLES
// Vanilla Pod
/obj/item/seeds/cocoapod/vanillapod
@@ -43,4 +44,5 @@
name = "vanilla pod"
desc = "Fattening... Mmmmm... vanilla."
icon_state = "vanillapod"
filling_color = "#FFD700"
filling_color = "#FFD700"
foodtype = VEGETABLES
code/modules/hydroponics/grown/corn.dm
+2 -1
View File
@@ -24,6 +24,7 @@
filling_color = "#FFFF00"
trash = /obj/item/weapon/grown/corncob
bitesize_mod = 2
foodtype = VEGETABLES
/obj/item/weapon/grown/corncob
name = "corn cob"
@@ -79,4 +80,4 @@
snap_pops -= 1
if(!snap_pops)
new /obj/item/weapon/grown/corncob(user.loc)
qdel(src)
qdel(src)
code/modules/hydroponics/grown/eggplant.dm
+3 -1
View File
@@ -22,6 +22,7 @@
icon_state = "eggplant"
filling_color = "#800080"
bitesize_mod = 2
foodtype = FRUIT
// Egg-Plant
/obj/item/seeds/eggplant/eggy
@@ -41,4 +42,5 @@
icon_state = "eggyplant"
trash = /obj/item/weapon/reagent_containers/food/snacks/egg
filling_color = "#F8F8FF"
bitesize_mod = 2
bitesize_mod = 2
foodtype = MEAT
code/modules/hydroponics/grown/flowers.dm
+1
View File
@@ -25,6 +25,7 @@
slot_flags = SLOT_HEAD
filling_color = "#FF6347"
bitesize_mod = 3
foodtype = VEGETABLES | GROSS
// Lily
/obj/item/seeds/poppy/lily
code/modules/hydroponics/grown/kudzu.dm
+2 -1
View File
@@ -99,4 +99,5 @@
desc = "<I>Pueraria Virallis</I>: An invasive species with vines that rapidly creep and wrap around whatever they contact."
icon_state = "kudzupod"
filling_color = "#6B8E23"
bitesize_mod = 2
bitesize_mod = 2
foodtype = VEGETABLES | GROSS
code/modules/hydroponics/grown/melon.dm
+1
View File
@@ -25,6 +25,7 @@
w_class = WEIGHT_CLASS_NORMAL
filling_color = "#008000"
bitesize_mod = 3
foodtype = FRUIT
// Holymelon
/obj/item/seeds/watermelon/holy
code/modules/hydroponics/grown/misc.dm
+4 -1
View File
@@ -54,6 +54,7 @@
icon_state = "cabbage"
filling_color = "#90EE90"
bitesize_mod = 2
foodtype = VEGETABLES
// Sugarcane
@@ -79,6 +80,7 @@
icon_state = "sugarcane"
filling_color = "#FFD700"
bitesize_mod = 2
foodtype = VEGETABLES | SUGAR
// Gatfruit
@@ -109,6 +111,7 @@
origin_tech = "combat=6"
trash = /obj/item/weapon/gun/ballistic/revolver
bitesize_mod = 2
foodtype = FRUIT
//Cherry Bombs
/obj/item/seeds/cherry/bomb
@@ -164,4 +167,4 @@
plantname = "Fruiting Cactus"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
growthstages = 2
growthstages = 2
code/modules/hydroponics/grown/mushrooms.dm
+4 -1
View File
@@ -1,6 +1,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom
name = "mushroom"
bitesize_mod = 2
foodtype = VEGETABLES
// Reishi
@@ -22,6 +23,9 @@
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("morphine" = 0.35, "charcoal" = 0.35, "nutriment" = 0)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi
seed = /obj/item/seeds/reishi
name = "reishi"
@@ -29,7 +33,6 @@
icon_state = "reishi"
filling_color = "#FF4500"
// Fly Amanita
/obj/item/seeds/amanita
name = "pack of fly amanita mycelium"
code/modules/hydroponics/grown/potato.dm
+2 -1
View File
@@ -25,6 +25,7 @@
icon_state = "potato"
filling_color = "#E9967A"
bitesize = 100
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/grown/potato/wedges
@@ -61,4 +62,4 @@
seed = /obj/item/seeds/potato/sweet
name = "sweet potato"
desc = "It's sweet."
icon_state = "sweetpotato"
icon_state = "sweetpotato"
code/modules/hydroponics/grown/pumpkin.dm
+2
View File
@@ -23,6 +23,7 @@
icon_state = "pumpkin"
filling_color = "#FFA500"
bitesize_mod = 2
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(W.is_sharp())
@@ -52,3 +53,4 @@
icon_state = "blumpkin"
filling_color = "#87CEFA"
bitesize_mod = 2
foodtype = VEGETABLES
code/modules/hydroponics/grown/root.dm
+4
View File
@@ -21,6 +21,7 @@
icon_state = "carrot"
filling_color = "#FFA500"
bitesize_mod = 2
foodtype = VEGETABLES
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params)
if(I.is_sharp())
@@ -50,6 +51,7 @@
desc = "Closely related to carrots."
icon_state = "parsnip"
bitesize_mod = 2
foodtype = VEGETABLES
// White-Beet
@@ -75,6 +77,7 @@
icon_state = "whitebeet"
filling_color = "#F4A460"
bitesize_mod = 2
foodtype = VEGETABLES
// Red Beet
/obj/item/seeds/redbeet
@@ -98,3 +101,4 @@
desc = "You can't beat red beet."
icon_state = "redbeet"
bitesize_mod = 2
foodtype = VEGETABLES
code/modules/hydroponics/grown/tomato.dm
+2 -1
View File
@@ -22,6 +22,7 @@
splat_type = /obj/effect/decal/cleanable/tomato_smudge
filling_color = "#FF6347"
bitesize_mod = 2
foodtype = VEGETABLES
// Blood Tomato
/obj/item/seeds/tomato/blood
@@ -43,7 +44,7 @@
splat_type = /obj/effect/gibspawner/generic
filling_color = "#FF0000"
origin_tech = "biotech=5"
foodtype = VEGETABLES | GROSS
// Blue Tomato
/obj/item/seeds/tomato/blue
code/modules/hydroponics/hydroponics.dm
+1 -14
View File
@@ -6,6 +6,7 @@
anchored = TRUE
pixel_y = 8
unique_rename = 1
circuit = /obj/item/weapon/circuitboard/machine/hydroponics
var/waterlevel = 100 //The amount of water in the tray (max 100)
var/maxwater = 100 //The maximum amount of water in the tray
var/nutrilevel = 10 //The amount of nutrient in the tray (max 10)
@@ -37,20 +38,6 @@
icon = 'icons/obj/hydroponics/equipment.dmi'
icon_state = "hydrotray3"
/obj/machinery/hydroponics/constructable/New()
..()
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/hydroponics(null)
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/hydroponics
name = "Hydroponics Tray (Machine Board)"
build_path = /obj/machinery/hydroponics/constructable
origin_tech = "programming=1;biotech=2"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 2,
/obj/item/weapon/stock_parts/manipulator = 1,
/obj/item/weapon/stock_parts/console_screen = 1)
/obj/machinery/hydroponics/constructable/RefreshParts()
var/tmp_capacity = 0
for (var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
code/modules/hydroponics/seed_extractor.dm
+1 -13
View File
@@ -44,23 +44,11 @@
icon_state = "sextractor"
density = TRUE
anchored = TRUE
circuit = /obj/item/weapon/circuitboard/machine/seed_extractor
var/piles = list()
var/max_seeds = 1000
var/seed_multiplier = 1
/obj/machinery/seed_extractor/New()
..()
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/seed_extractor(null)
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/seed_extractor
name = "Seed Extractor (Machine Board)"
build_path = /obj/machinery/seed_extractor
origin_tech = "programming=1"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 1,
/obj/item/weapon/stock_parts/manipulator = 1)
/obj/machinery/seed_extractor/RefreshParts()
for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)
max_seeds = 1000 * B.rating