cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
c0
2016-03-11 09:52:20 +03:00
parent 410ad60750
commit 6b7774a1de
13 changed files with 98 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown.dm
+8 -12
View File
@@ -24,7 +24,6 @@
// This is for adminspawn or map-placed growns. They get the default stats of their seed type.
seed = new seed()
seed.potency = 50
seed.prepare_result(src)
else // Something is terribly wrong
qdel(src)
return
@@ -35,16 +34,13 @@
if(dried_type == -1)
dried_type = src.type
add_juice()
for(var/datum/plant_gene/trait/T in seed.genes)
T.on_new(src, newloc)
seed.prepare_result(src)
add_juice()
transform *= TransformUsingVariable(seed.potency, 100, 0.5) //Makes the resulting produce's sprite larger or smaller based on potency!
var/datum/plant_gene/trait/glow/G = seed.get_gene(/datum/plant_gene/trait/glow)
if(G)
if(istype(src.loc,/mob))
pickup(src.loc)//adjusts the lighting on the mob
else
src.SetLuminosity(G.get_lum(seed))
/obj/item/weapon/reagent_containers/food/snacks/grown/proc/add_juice()
@@ -117,7 +113,7 @@
for(var/datum/plant_gene/trait/trait in seed.genes)
trait.on_squash(src, target)
for(var/atom/A in T)
for(var/A in T)
reagents.reaction(A)
qdel(src)
@@ -128,9 +124,9 @@
T.on_consume(src, usr)
..()
/obj/item/weapon/reagent_containers/food/snacks/grown/Crossed(AM as mob|obj)
/obj/item/weapon/reagent_containers/food/snacks/grown/Crossed(atom/movable/AM)
var/datum/plant_gene/trait/slip/S = seed.get_gene(/datum/plant_gene/trait/slip)
if(S && !ispath(trash, /obj/item/weapon/grown) && istype(AM, /mob/living/carbon))
if(S && !ispath(trash, /obj/item/weapon/grown) && iscarbon(AM))
var/mob/living/carbon/M = AM
var/stun = min(seed.potency * S.rate * 2, 1)
var/weaken = min(seed.potency * S.rate, 0.5)
@@ -144,7 +140,7 @@
// Glow gene procs
/obj/item/weapon/reagent_containers/food/snacks/grown/Destroy()
var/datum/plant_gene/trait/glow/G = seed.get_gene(/datum/plant_gene/trait/glow)
if(G && istype(loc,/mob))
if(G && ismob(loc))
loc.AddLuminosity(-G.get_lum(seed))
return ..()
code/modules/hydroponics/grown/banana.dm
-2
View File
@@ -100,14 +100,12 @@
icon_state = "banana_blue"
trash = /obj/item/weapon/grown/bananapeel/bluespace
filling_color = "#0000FF"
origin_tech = "bluespace=3"
/obj/item/weapon/grown/bananapeel/bluespace
seed = /obj/item/seeds/banana/bluespace
name = "bluespace banana peel"
desc = "A peel from a bluespace banana."
icon_state = "banana_peel_blue"
origin_tech = "bluespace=3"
// Other
code/modules/hydroponics/grown/tomato.dm
-1
View File
@@ -86,7 +86,6 @@
name = "blue-space tomato"
desc = "So lubricated, you might slip through space-time."
icon_state = "bluespacetomato"
origin_tech = "bluespace=3"
// Killer Tomato
code/modules/hydroponics/growninedible.dm
+8 -11
View File
@@ -18,7 +18,6 @@
// This is for adminspawn or map-placed growns. They get the default stats of their seed type.
seed = new seed()
seed.potency = 50
seed.prepare_result(src)
else // Something is terribly wrong
qdel(src)
return
@@ -26,16 +25,14 @@
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
add_juice()
for(var/datum/plant_gene/trait/T in seed.genes)
T.on_new(src, newloc)
if(istype(src, seed.product)) // no adding reagents if it is just a trash item
seed.prepare_result(src)
add_juice()
transform *= TransformUsingVariable(seed.potency, 100, 0.5)
var/datum/plant_gene/trait/glow/G = seed.get_gene(/datum/plant_gene/trait/glow)
if(G)
if(istype(src.loc,/mob))
pickup(src.loc)//adjusts the lighting on the mob
else
src.SetLuminosity(G.get_lum(seed))
/obj/item/weapon/grown/attackby(obj/item/O, mob/user, params)
..()
@@ -52,9 +49,9 @@
return 0
/obj/item/weapon/grown/Crossed(AM as mob|obj)
/obj/item/weapon/grown/Crossed(atom/movable/AM)
var/datum/plant_gene/trait/slip/S = seed.get_gene(/datum/plant_gene/trait/slip)
if(S && istype(AM, /mob/living/carbon))
if(S && iscarbon(AM))
var/mob/living/carbon/M = AM
var/stun = min(seed.potency * S.rate * 2, 1)
var/weaken = min(seed.potency * S.rate, 0.5)
@@ -68,7 +65,7 @@
// Glow gene procs
/obj/item/weapon/grown/Destroy()
var/datum/plant_gene/trait/glow/G = seed.get_gene(/datum/plant_gene/trait/glow)
if(G && istype(loc,/mob))
if(G && ismob(loc))
loc.AddLuminosity(-G.get_lum(seed))
return ..()
code/modules/hydroponics/plant_genes.dm
+39 -3
View File
@@ -85,22 +85,36 @@
/datum/plant_gene/trait
var/rate = 0.05
var/examine_line = ""
var/list/origin_tech = null
/datum/plant_gene/trait/Copy()
var/datum/plant_gene/trait/G = ..()
G.rate = rate
return G
/datum/plant_gene/trait/proc/on_new(obj/item/weapon/reagent_containers/food/snacks/grown/G, newloc)
if(origin_tech) // This ugly code segment adds RnD tech levels to resulting plants.
if(G.origin_tech)
var/list/tech = params2list(G.origin_tech)
for(var/t in origin_tech)
if(t in tech)
tech[t] = max(tech[t], origin_tech[t])
else
tech[t] = origin_tech[t]
G.origin_tech = list2params(tech)
else
G.origin_tech = list2params(origin_tech)
return
/datum/plant_gene/trait/proc/on_consume(obj/item/weapon/reagent_containers/food/snacks/grown/G, mob/living/carbon/target)
return
/datum/plant_gene/trait/proc/on_slip(obj/item/weapon/reagent_containers/food/snacks/grown/G, mob/living/carbon/target)
return
/datum/plant_gene/trait/proc/on_squash(obj/item/weapon/reagent_containers/food/snacks/grown/G, atom/target)
return
/datum/plant_gene/trait/squash
// Allows the plant to be squashed when thrown or slipped on, leaving a colored mess and trash type item behind.
// Also splashes everything in target turf with reagents and applies other trait effects (teleporting, etc) to the target by on_squash.
@@ -128,6 +142,7 @@
// Multiplies max charge by (rate*1000) when used in potato power cells.
name = "Electrical Activity"
rate = 0.01
origin_tech = list("powerstorage" = 4)
/datum/plant_gene/trait/cell_charge/on_slip(obj/item/weapon/reagent_containers/food/snacks/grown/G, mob/living/carbon/C)
var/power = G.seed.potency*rate*5
@@ -168,6 +183,13 @@
/datum/plant_gene/trait/glow/proc/get_lum(obj/item/seeds/S)
return round(S.potency*rate)
/datum/plant_gene/trait/glow/on_new(obj/item/weapon/reagent_containers/food/snacks/grown/G, newloc)
..()
if(ismob(newloc))
G.pickup(newloc)//adjusts the lighting on the mob
else
G.SetLuminosity(get_lum(G.seed))
/datum/plant_gene/trait/glow/berry
name = "Strong Bioluminescence"
rate = 0.2
@@ -178,6 +200,7 @@
// Teleport radius is calculated as max(round(potency*rate), 1)
name = "Bluespace Activity"
rate = 0.1
origin_tech = list("bluespace" = 3)
/datum/plant_gene/trait/teleport/on_squash(obj/item/weapon/reagent_containers/food/snacks/grown/G, atom/target)
if(isliving(target))
@@ -195,4 +218,17 @@
do_teleport(G, T, teleport_radius)
else
new /obj/effect/decal/cleanable/molten_item(T) //Leave a pile of goo behind for dramatic effect...
qdel(G)
qdel(G)
/datum/plant_gene/trait/noreact
// Makes plant NOREACT until squashed.
name = "Separated Chemicals"
/datum/plant_gene/trait/noreact/on_new(obj/item/weapon/reagent_containers/food/snacks/grown/G, newloc)
..()
G.flags |= NOREACT
/datum/plant_gene/trait/noreact/on_squash(obj/item/weapon/reagent_containers/food/snacks/grown/G, atom/target)
G.flags &= ~NOREACT
G.reagents.handle_reactions()
code/modules/hydroponics/seeds.dm
+13 -6
View File
@@ -51,9 +51,9 @@
if(!nogenes) // not used on Copy()
genes += new /datum/plant_gene/core/lifespan(lifespan)
genes += new /datum/plant_gene/core/endurance(endurance)
genes += new /datum/plant_gene/core/production(production)
if(yield != -1)
genes += new /datum/plant_gene/core/yield(yield)
genes += new /datum/plant_gene/core/production(production)
if(potency != -1)
genes += new /datum/plant_gene/core/potency(potency)
@@ -83,6 +83,12 @@
/obj/item/seeds/proc/get_gene(typepath)
return (locate(typepath) in genes)
/obj/item/seeds/proc/reagents_from_genes()
reagents_add = list()
for(var/datum/plant_gene/reagent/R in genes)
reagents_add[R.reagent_id] = R.rate
/obj/item/seeds/bullet_act(obj/item/projectile/Proj) //Works with the Somatoray to modify plant variables.
if(istype(Proj, /obj/item/projectile/energy/florayield))
@@ -120,7 +126,6 @@
var/product_name
while(t_amount < getYield())
var/obj/item/weapon/reagent_containers/food/snacks/grown/t_prod = new product(output_loc, src)
prepare_result(t_prod)
result.Add(t_prod) // User gets a consumable
if(!t_prod)
return
@@ -164,9 +169,10 @@
C.value = endurance
/obj/item/seeds/proc/adjust_production(adjustamt)
production = Clamp(production + adjustamt, 2, 10)
var/datum/plant_gene/core/C = get_gene(/datum/plant_gene/core/production)
C.value = production
if(yield != -1)
production = Clamp(production + adjustamt, 2, 10)
var/datum/plant_gene/core/C = get_gene(/datum/plant_gene/core/production)
C.value = production
/obj/item/seeds/proc/adjust_potency(adjustamt)
if(potency != -1)
@@ -191,7 +197,8 @@
if(yield != -1)
text += "- Yield: [yield]\n"
text += "- Maturation speed: [maturation]\n"
text += "- Production speed: [production]\n"
if(yield != -1)
text += "- Production speed: [production]\n"
text += "- Endurance: [endurance]\n"
text += "- Lifespan: [lifespan]\n"
if(rarity)