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

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

Browse Source
This commit is contained in:
LetterJay
2017-12-16 13:08:50 -06:00
committed by GitHub
parent 715960b324
commit 7af461539f
756 changed files with 10062 additions and 11368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/beekeeping/beebox.dm
+13 -14
View File
@@ -37,8 +37,8 @@
var/bee_resources = 0
/obj/structure/beebox/Initialize()
. = ..()
/obj/structure/beebox/New()
..()
START_PROCESSING(SSobj, src)
@@ -55,8 +55,8 @@
var/random_reagent = FALSE
/obj/structure/beebox/premade/Initialize()
. = ..()
/obj/structure/beebox/premade/New()
..()
icon_state = "beebox"
var/datum/reagent/R = null
@@ -152,7 +152,6 @@
else
to_chat(user, "<span class='warning'>There's no room for any more frames in the apiary!</span>")
return
if(istype(I, /obj/item/wrench))
if(default_unfasten_wrench(user, I, time = 20))
return
@@ -179,7 +178,7 @@
bees -= B
B.beehome = null
if(B.loc == src)
B.forceMove(drop_location())
B.loc = get_turf(src)
relocated++
if(relocated)
to_chat(user, "<span class='warning'>This queen has a different reagent to some of the bees who live here, those bees will not return to this apiary!</span>")
@@ -202,7 +201,7 @@
if(B.isqueen)
continue
if(B.loc == src)
B.forceMove(drop_location())
B.loc = get_turf(src)
B.target = user
bees = TRUE
if(bees)
@@ -222,7 +221,7 @@
var/obj/item/honey_frame/HF = pick_n_take(honey_frames)
if(HF)
if(!user.put_in_active_hand(HF))
HF.forceMove(drop_location())
HF.loc = get_turf(src)
visible_message("<span class='notice'>[user] removes a frame from the apiary.</span>")
var/amtH = HF.honeycomb_capacity
@@ -230,7 +229,7 @@
while(honeycombs.len && amtH) //let's pretend you always grab the frame with the most honeycomb on it
var/obj/item/reagent_containers/honeycomb/HC = pick_n_take(honeycombs)
if(HC)
HC.forceMove(drop_location())
HC.loc = get_turf(user)
amtH--
fallen++
if(fallen)
@@ -242,12 +241,12 @@
to_chat(user, "<span class='warning'>There is no queen bee to remove!</span>")
return
var/obj/item/queen_bee/QB = new()
queen_bee.forceMove(QB)
queen_bee.loc = QB
bees -= queen_bee
QB.queen = queen_bee
QB.name = queen_bee.name
if(!user.put_in_active_hand(QB))
QB.forceMove(drop_location())
QB.loc = get_turf(src)
visible_message("<span class='notice'>[user] removes the queen from the apiary.</span>")
queen_bee = null
@@ -255,8 +254,8 @@
new /obj/item/stack/sheet/mineral/wood (loc, 20)
for(var/mob/living/simple_animal/hostile/poison/bees/B in bees)
if(B.loc == src)
B.forceMove(drop_location())
B.loc = get_turf(src)
for(var/obj/item/honey_frame/HF in honey_frames)
if(HF.loc == src)
HF.forceMove(drop_location())
qdel(src)
HF.loc = get_turf(src)
qdel(src)
code/modules/hydroponics/beekeeping/honeycomb.dm
+2 -3
View File
@@ -10,11 +10,10 @@
volume = 10
amount_per_transfer_from_this = 0
list_reagents = list("honey" = 5)
grind_results = list()
var/honey_color = ""
/obj/item/reagent_containers/honeycomb/Initialize()
. = ..()
/obj/item/reagent_containers/honeycomb/New()
..()
pixel_x = rand(8,-8)
pixel_y = rand(8,-8)
update_icon()
code/modules/hydroponics/biogenerator.dm
+1 -1
View File
@@ -78,7 +78,7 @@
if(default_deconstruction_screwdriver(user, "biogen-empty-o", "biogen-empty", O))
if(beaker)
var/obj/item/reagent_containers/glass/B = beaker
B.forceMove(drop_location())
B.loc = loc
beaker = null
update_icon()
return
code/modules/hydroponics/gene_modder.dm
+5 -5
View File
@@ -260,7 +260,7 @@
if(href_list["eject_seed"] && !operation)
if (seed)
seed.forceMove(drop_location())
seed.loc = src.loc
seed.verb_pickup()
seed = null
update_genes()
@@ -275,7 +275,7 @@
update_icon()
else if(href_list["eject_disk"] && !operation)
if (disk)
disk.forceMove(drop_location())
disk.loc = src.loc
disk.verb_pickup()
disk = null
update_genes()
@@ -368,7 +368,7 @@
/obj/machinery/plantgenes/proc/insert_seed(obj/item/seeds/S)
if(!istype(S) || seed)
return
S.forceMove(src)
S.loc = src
seed = S
update_genes()
update_icon()
@@ -422,8 +422,8 @@
var/read_only = 0 //Well, it's still a floppy disk
unique_rename = 1
/obj/item/disk/plantgene/Initialize()
. = ..()
/obj/item/disk/plantgene/New()
..()
add_overlay("datadisk_gene")
src.pixel_x = rand(-5, 5)
src.pixel_y = rand(-5, 5)
code/modules/hydroponics/grown.dm
-23
View File
@@ -15,7 +15,6 @@
// Saves us from having to define each stupid grown's dried_type as itself.
// If you don't want a plant to be driable (watermelons) set this to null in the time definition.
resistance_flags = FLAMMABLE
var/dry_grind = FALSE //If TRUE, this object needs to be dry to be ground up
/obj/item/reagent_containers/food/snacks/grown/Initialize(mapload, obj/item/seeds/new_seed)
. = ..()
@@ -138,28 +137,6 @@
return
return ..()
/obj/item/reagent_containers/food/snacks/grown/grind_requirements()
if(dry_grind && !dry)
to_chat(usr, "<span class='warning'>[src] needs to be dry before it can be ground up!</span>")
return
return TRUE
/obj/item/reagent_containers/food/snacks/grown/on_grind()
var/nutriment = reagents.get_reagent_amount("nutriment")
if(grind_results.len)
for(var/i in 1 to grind_results.len)
grind_results[grind_results[i]] = nutriment
reagents.del_reagent("nutriment")
reagents.del_reagent("vitamin")
/obj/item/reagent_containers/food/snacks/grown/on_juice()
var/nutriment = reagents.get_reagent_amount("nutriment")
if(juice_results.len)
for(var/i in 1 to juice_results.len)
juice_results[juice_results[i]] = nutriment
reagents.del_reagent("nutriment")
reagents.del_reagent("vitamin")
// For item-containing growns such as eggy or gatfruit
/obj/item/reagent_containers/food/snacks/grown/shell/attack_self(mob/user)
var/obj/item/T
code/modules/hydroponics/grown/apple.dm
-1
View File
@@ -15,7 +15,6 @@
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/apple/gold)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
juice_results = list("applejuice" = 0)
/obj/item/reagent_containers/food/snacks/grown/apple
seed = /obj/item/seeds/apple
code/modules/hydroponics/grown/banana.dm
-1
View File
@@ -13,7 +13,6 @@
genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/banana/mime, /obj/item/seeds/banana/bluespace)
reagents_add = list("banana" = 0.1, "potassium" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02)
juice_results = list("banana" = 0)
/obj/item/reagent_containers/food/snacks/grown/banana
seed = /obj/item/seeds/banana
code/modules/hydroponics/grown/beans.dm
-1
View File
@@ -26,7 +26,6 @@
filling_color = "#F0E68C"
bitesize_mod = 2
foodtype = VEGETABLES
grind_results = list("soymilk" = 0)
// Koibean
/obj/item/seeds/soya/koi
code/modules/hydroponics/grown/berries.dm
-5
View File
@@ -26,7 +26,6 @@
filling_color = "#FF00FF"
bitesize_mod = 2
foodtype = FRUIT
juice_results = list("berryjuice" = 0)
// Poison Berries
/obj/item/seeds/berry/poison
@@ -47,7 +46,6 @@
icon_state = "poisonberrypile"
filling_color = "#C71585"
foodtype = FRUIT | TOXIC
juice_results = list("poisonberryjuice" = 0)
// Death Berries
/obj/item/seeds/berry/death
@@ -123,7 +121,6 @@
filling_color = "#FF0000"
bitesize_mod = 2
foodtype = FRUIT
grind_results = list("cherryjelly" = 0)
// Blue Cherries
/obj/item/seeds/cherry/blue
@@ -145,7 +142,6 @@
filling_color = "#6495ED"
bitesize_mod = 2
foodtype = FRUIT
grind_results = list("bluecherryjelly" = 0)
// Grapes
/obj/item/seeds/grape
@@ -177,7 +173,6 @@
filling_color = "#FF1493"
bitesize_mod = 2
foodtype = FRUIT
juice_results = list("grapejuice" = 0)
// Green Grapes
/obj/item/seeds/grape/green
code/modules/hydroponics/grown/cereals.dm
-4
View File
@@ -22,7 +22,6 @@
filling_color = "#F0E68C"
bitesize_mod = 2
foodtype = GRAIN
grind_results = list("flour" = 0)
// Oat
/obj/item/seeds/wheat/oat
@@ -43,7 +42,6 @@
filling_color = "#556B2F"
bitesize_mod = 2
foodtype = GRAIN
grind_results = list("flour" = 0)
// Rice
/obj/item/seeds/wheat/rice
@@ -65,7 +63,6 @@
filling_color = "#FAFAD2"
bitesize_mod = 2
foodtype = GRAIN
grind_results = list("rice" = 0)
//Meatwheat - grows into synthetic meat
/obj/item/seeds/wheat/meat
@@ -86,7 +83,6 @@
bitesize_mod = 2
seed = /obj/item/seeds/wheat/meat
foodtype = MEAT | GRAIN
grind_results = list("flour" = 0, "blood" = 0)
/obj/item/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/citrus.dm
-3
View File
@@ -30,7 +30,6 @@
desc = "It's so sour, your face will twist."
icon_state = "lime"
filling_color = "#00FF00"
juice_results = list("limejuice" = 0)
// Orange
/obj/item/seeds/orange
@@ -57,7 +56,6 @@
desc = "It's a tangy fruit."
icon_state = "orange"
filling_color = "#FFA500"
juice_results = list("orangejuice" = 0)
// Lemon
/obj/item/seeds/lemon
@@ -83,7 +81,6 @@
desc = "When life gives you lemons, make lemonade."
icon_state = "lemon"
filling_color = "#FFD700"
juice_results = list("lemonjuice" = 0)
// Combustible lemon
/obj/item/seeds/firelemon //combustible lemon is too long so firelemon
code/modules/hydroponics/grown/corn.dm
-1
View File
@@ -25,7 +25,6 @@
trash = /obj/item/grown/corncob
bitesize_mod = 2
foodtype = VEGETABLES
juice_results = list("corn_starch" = 0)
/obj/item/grown/corncob
name = "corn cob"
code/modules/hydroponics/grown/flowers.dm
-1
View File
@@ -182,7 +182,6 @@
throw_speed = 1
throw_range = 3
attack_verb = list("roasted", "scorched", "burned")
grind_results = list("capsaicin" = 0, "condensedcapsaicin" = 0)
/obj/item/grown/novaflower/add_juice()
..()
code/modules/hydroponics/grown/melon.dm
-1
View File
@@ -33,7 +33,6 @@
filling_color = "#008000"
bitesize_mod = 3
foodtype = FRUIT
juice_results = list("watermelonjuice" = 0)
// Holymelon
/obj/item/seeds/watermelon/holy
code/modules/hydroponics/grown/nettle.dm
-2
View File
@@ -43,7 +43,6 @@
throw_speed = 1
throw_range = 3
attack_verb = list("stung")
grind_results = list("sacid" = 0)
/obj/item/grown/nettle/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is eating some of [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -92,7 +91,6 @@
icon_state = "deathnettle"
force = 30
throwforce = 15
grind_results = list("facid" = 1, "sacid" = 1)
/obj/item/grown/nettle/death/add_juice()
..()
code/modules/hydroponics/grown/potato.dm
-1
View File
@@ -17,7 +17,6 @@
genes = list(/datum/plant_gene/trait/battery)
mutatelist = list(/obj/item/seeds/potato/sweet)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
juice_results = list("potato" = 0)
/obj/item/reagent_containers/food/snacks/grown/potato
seed = /obj/item/seeds/potato
code/modules/hydroponics/grown/pumpkin.dm
+1 -3
View File
@@ -24,7 +24,6 @@
filling_color = "#FFA500"
bitesize_mod = 2
foodtype = VEGETABLES
juice_results = list("pumpkinjuice" = 0)
/obj/item/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params)
if(W.is_sharp())
@@ -54,5 +53,4 @@
icon_state = "blumpkin"
filling_color = "#87CEFA"
bitesize_mod = 2
foodtype = VEGETABLES
juice_results = list("blumpkinjuice" = 0)
foodtype = VEGETABLES
code/modules/hydroponics/grown/random.dm
+2 -2
View File
@@ -12,9 +12,9 @@
icon_harvest = "xpod-harvest"
growthstages = 4
/obj/item/seeds/random/Initialize()
. = ..()
/obj/item/seeds/random/New()
randomize_stats()
..()
if(prob(60))
add_random_reagents(1, 3)
if(prob(50))
code/modules/hydroponics/grown/root.dm
-1
View File
@@ -22,7 +22,6 @@
filling_color = "#FFA500"
bitesize_mod = 2
foodtype = VEGETABLES
juice_results = list("carrotjuice" = 0)
/obj/item/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params)
if(I.is_sharp())
code/modules/hydroponics/grown/tea_coffee.dm
+2 -7
View File
@@ -14,6 +14,7 @@
icon_dead = "tea-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/tea/astra)
reagents_add = list("vitamin" = 0.04, "teapowder" = 0.1)
/obj/item/reagent_containers/food/snacks/grown/tea
seed = /obj/item/seeds/tea
@@ -21,8 +22,6 @@
desc = "These aromatic tips of the tea plant can be dried to make tea."
icon_state = "tea_aspera_leaves"
filling_color = "#008000"
grind_results = list("teapowder" = 0)
dry_grind = TRUE
// Tea Astra
/obj/item/seeds/tea/astra
@@ -40,7 +39,6 @@
name = "Tea Astra tips"
icon_state = "tea_astra_leaves"
filling_color = "#4582B4"
grind_results = list("teapowder" = 0, "salglu_solution" = 0)
// Coffee
@@ -69,8 +67,6 @@
icon_state = "coffee_arabica"
filling_color = "#DC143C"
bitesize_mod = 2
dry_grind = TRUE
grind_results = list("coffeepowder" = 0)
// Coffee Robusta
/obj/item/seeds/coffee/robusta
@@ -88,5 +84,4 @@
seed = /obj/item/seeds/coffee/robusta
name = "coffee robusta beans"
desc = "Increases robustness by 37 percent!"
icon_state = "coffee_robusta"
grind_results = list("coffeepowder" = 0, "morphine" = 0)
icon_state = "coffee_robusta"
code/modules/hydroponics/grown/tomato.dm
-3
View File
@@ -23,8 +23,6 @@
filling_color = "#FF6347"
bitesize_mod = 2
foodtype = VEGETABLES
grind_results = list("ketchup" = 0)
juice_results = list("tomatojuice" = 0)
// Blood Tomato
/obj/item/seeds/tomato/blood
@@ -46,7 +44,6 @@
splat_type = /obj/effect/gibspawner/generic
filling_color = "#FF0000"
foodtype = VEGETABLES | GROSS
grind_results = list("ketchup" = 0, "blood" = 0)
// Blue Tomato
code/modules/hydroponics/growninedible.dm
-4
View File
@@ -62,7 +62,3 @@
/obj/item/grown/microwave_act(obj/machine/microwave/M)
return
/obj/item/grown/on_grind()
for(var/i in 1 to grind_results.len)
grind_results[grind_results[i]] = round(seed.potency)
code/modules/hydroponics/hydroponics.dm
+1 -1
View File
@@ -108,7 +108,7 @@
var/needs_update = 0 // Checks if the icon needs updating so we don't redraw empty trays every time
if(myseed && (myseed.loc != src))
myseed.forceMove(src)
myseed.loc = src
if(self_sustaining)
adjustNutri(1)
code/modules/hydroponics/sample.dm
+2 -2
View File
@@ -5,8 +5,8 @@
yield = -1
var/sample_color = "#FFFFFF"
/obj/item/seeds/sample/Initialize()
. = ..()
/obj/item/seeds/sample/New()
..()
if(sample_color)
var/mutable_appearance/filling = mutable_appearance(icon, "sample-filling")
filling.color = sample_color
code/modules/hydroponics/seed_extractor.dm
+3 -3
View File
@@ -17,7 +17,7 @@
return
while(t_amount < t_max)
var/obj/item/seeds/t_prod = F.seed.Copy()
t_prod.forceMove(seedloc)
t_prod.loc = seedloc
t_amount++
qdel(O)
return 1
@@ -29,7 +29,7 @@
return
while(t_amount < t_max)
var/obj/item/seeds/t_prod = F.seed.Copy()
t_prod.forceMove(seedloc)
t_prod.loc = seedloc
t_amount++
qdel(O)
return 1
@@ -168,7 +168,7 @@
for (var/obj/T in contents)//Now we find the seed we need to vend
var/obj/item/seeds/O = T
if (O.plantname == href_list["name"] && O.lifespan == href_list["li"] && O.endurance == href_list["en"] && O.maturation == href_list["ma"] && O.production == href_list["pr"] && O.yield == href_list["yi"] && O.potency == href_list["pot"])
O.forceMove(drop_location())
O.loc = src.loc
break
src.updateUsrDialog()
code/modules/hydroponics/seeds.dm
+2 -2
View File
@@ -35,8 +35,8 @@
var/weed_rate = 1 //If the chance below passes, then this many weeds sprout during growth
var/weed_chance = 5 //Percentage chance per tray update to grow weeds
/obj/item/seeds/Initialize(loc, nogenes = 0)
. = ..()
/obj/item/seeds/New(loc, nogenes = 0)
..()
pixel_x = rand(-8, 8)
pixel_y = rand(-8, 8)