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

Merge pull request #18534 from Core0verload/ash_fix

Browse Source 
Fixes unkillable ash drake (+ more runtime fixes)
This commit is contained in:
oranges
2016-06-15 10:44:20 +12:00
committed by GitHub
parent 70ca753d36 d7eee00a0b
commit 9c451faa2c
11 changed files with 86 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown/replicapod.dm
+1 -1
View File
@@ -108,6 +108,6 @@
seed_count++
for(var/i=0,i<seed_count,i++)
var/obj/item/seeds/replicapod/harvestseeds = src.Copy()
harvestseeds.loc = user.loc
harvestseeds.forceMove(parent.loc)
parent.update_tray()
code/modules/hydroponics/hydroponics.dm
+1 -1
View File
@@ -858,7 +858,7 @@
if(istype(user, /mob/living/silicon)) //How does AI know what plant is?
return
if(harvest)
myseed.harvest()
myseed.harvest(user)
else if(dead)
dead = 0
user << "<span class='notice'>You remove the dead plant from [src].</span>"
code/modules/hydroponics/plant_genes.dm
+14 -13
View File
@@ -141,18 +141,19 @@
return TRUE
/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
if(!origin_tech) // This ugly code segment adds RnD tech levels to resulting plants.
return
if(G.origin_tech)
var/list/tech = params2list(G.origin_tech)
for(var/t in origin_tech)
if(t in tech)
tech[t] = max(text2num(tech[t]), origin_tech[t])
else
tech[t] = origin_tech[t]
G.origin_tech = list2params(tech)
else
G.origin_tech = list2params(origin_tech)
/datum/plant_gene/trait/proc/on_consume(obj/item/weapon/reagent_containers/food/snacks/grown/G, mob/living/carbon/target)
return
@@ -171,7 +172,7 @@
// For code, see grown.dm
name = "Liquid Contents"
examine_line = "<span class='info'>It has a lot of liquid contents inside.</span>"
origin_tech = list("bio" = 5)
origin_tech = list("biotech" = 5)
/*/datum/plant_gene/trait/squash/on_slip(obj/item/weapon/reagent_containers/food/snacks/grown/G, mob/living/carbon/target)
G.squash(target)*/