diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm
index 92bb7ac4c07..8b6c00d6b7c 100644
--- a/code/game/objects/items/weapons/power_cells.dm
+++ b/code/game/objects/items/weapons/power_cells.dm
@@ -18,6 +18,17 @@
var/minor_fault = 0 //If not 100% reliable, it will build up faults.
var/chargerate = 1000 //how much power is given every tick in a recharger
var/self_recharge = 0 //does it self recharge, over time, or not?
+ var/grown_battery = FALSE // If it's a grown that acts as a battery, add a wire overlay to it.
+
+/obj/item/weapon/stock_parts/cell/New()
+ ..()
+ processing_objects.Add(src)
+ charge = maxcharge
+ updateicon()
+
+/obj/item/weapon/stock_parts/cell/Destroy()
+ processing_objects.Remove(src)
+ return ..()
/obj/item/weapon/stock_parts/cell/suicide_act(mob/user)
to_chat(viewers(user), "[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide.")
@@ -29,6 +40,17 @@
else
return PROCESS_KILL
+/obj/item/weapon/stock_parts/cell/proc/updateicon()
+ overlays.Cut()
+ if(grown_battery)
+ overlays += image('icons/obj/power.dmi', "grown_wires")
+ if(charge < 0.01)
+ return
+ else if(charge/maxcharge >=0.995)
+ overlays += image('icons/obj/power.dmi', "cell-o2")
+ else
+ overlays += image('icons/obj/power.dmi', "cell-o1")
+
/obj/item/weapon/stock_parts/cell/crap
name = "\improper Nanotrasen brand rechargable AA battery"
desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
@@ -119,14 +141,15 @@
/obj/item/weapon/stock_parts/cell/potato
name = "potato battery"
desc = "A rechargable starch based power cell."
- origin_tech = "powerstorage=1"
- icon = 'icons/obj/power.dmi' //'icons/obj/harvest.dmi'
- icon_state = "potato_cell" //"potato_battery"
+ icon = 'icons/obj/hydroponics/harvest.dmi'
+ icon_state = "potato"
+ origin_tech = "powerstorage=1;biotech=1"
charge = 100
maxcharge = 3000
- rating = 1
materials = list()
+ rating = 1
minor_fault = 1
+ grown_battery = TRUE //it has the overlays for wires
/obj/item/weapon/stock_parts/cell/high/slime
name = "charged slime core"
diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index 804d9576951..18f87a8a45a 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -206,14 +206,14 @@
if(B.isqueen)
continue
if(B.loc == src)
- B.loc = get_turf(src)
+ B.forceMove(get_turf(src))
B.target = user
bees = TRUE
if(bees)
visible_message("[user] disturbs the bees!")
else
- var/option = alert(user, "What Action do you wish to perform?","Apiary","Remove a Honey Frame","Remove the Queen Bee")
- if(!Adjacent(user))
+ var/option = input(user, "What Action do you wish to perform?", "Apiary") as null|anything in list("Remove a Honey Frame","Remove the Queen Bee")
+ if(!Adjacent(user) || !option)
return
switch(option)
if("Remove a Honey Frame")
@@ -224,7 +224,7 @@
var/obj/item/honey_frame/HF = pick_n_take(honey_frames)
if(HF)
if(!user.put_in_active_hand(HF))
- HF.loc = get_turf(src)
+ HF.forceMove(get_turf(src))
visible_message("[user] removes a frame from the apiary.")
var/amtH = HF.honeycomb_capacity
@@ -232,7 +232,7 @@
while(honeycombs.len && amtH) //let's pretend you always grab the frame with the most honeycomb on it
var/obj/item/weapon/reagent_containers/honeycomb/HC = pick_n_take(honeycombs)
if(HC)
- HC.loc = get_turf(user)
+ HC.forceMove(get_turf(src))
amtH--
fallen++
if(fallen)
@@ -244,11 +244,11 @@
to_chat(user, "There is no queen bee to remove!")
return
var/obj/item/queen_bee/QB = new()
- queen_bee.loc = QB
+ queen_bee.forceMove(QB)
bees -= queen_bee
QB.queen = queen_bee
QB.name = queen_bee.name
if(!user.put_in_active_hand(QB))
- QB.loc = get_turf(src)
+ QB.forceMove(get_turf(src))
visible_message("[user] removes the queen from the apiary.")
queen_bee = null
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 373acd21ca8..795fa99f233 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -65,8 +65,8 @@
msg += "- Other substances: [reagents.total_volume-reagents.get_reagent_amount("nutriment")]\n"
msg += "*---------*"
- var/list/scannable_reagents = list("charcoal" = "Anti-Toxin", "morphine" = "Morphine", "amatoxin" = "Amatoxins",
- "toxin" = "Toxins", "mushroomhallucinogen" = "Mushroom Hallucinogen", "condensedcapsaicin" = "Condensed Capsaicin",
+ var/list/scannable_reagents = list("charcoal" = "Charcoal", "morphine" = "Morphine", "amanitin" = "Amatoxins",
+ "toxin" = "Toxins", "psilocybin" = "Psilocybin", "condensedcapsaicin" = "Condensed Capsaicin",
"capsaicin" = "Capsaicin", "frostoil" = "Frost Oil", "gold" = "Mineral Content", "glycerol" = "Glycerol",
"radium" = "Highly Radioactive Material", "uranium" = "Radioactive Material")
var/reag_txt = ""
diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm
index 95132f9ee1f..9d50bffb8f5 100644
--- a/code/modules/hydroponics/grown/ambrosia.dm
+++ b/code/modules/hydroponics/grown/ambrosia.dm
@@ -40,7 +40,7 @@
plantname = "Ambrosia Deus"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus
mutatelist = list(/obj/item/seeds/ambrosia/gaia)
- reagents_add = list("omnizine" = 0.15, "synaptizine" = 0.15, "space_drugs" = 0.1, "vitamin" = 0.04, "nutriment" = 0.05)
+ reagents_add = list("weak_omnizine" = 0.15, "synaptizine" = 0.15, "space_drugs" = 0.1, "vitamin" = 0.04, "nutriment" = 0.05)
rarity = 40
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus
diff --git a/code/modules/hydroponics/grown/apple.dm b/code/modules/hydroponics/grown/apple.dm
index 4d4712e0931..8acfac34f74 100644
--- a/code/modules/hydroponics/grown/apple.dm
+++ b/code/modules/hydroponics/grown/apple.dm
@@ -28,7 +28,7 @@
/obj/item/seeds/apple/poisoned
product = /obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned
mutatelist = list()
- reagents_add = list("zombiepowder" = 0.5, "vitamin" = 0.04, "nutriment" = 0.1)
+ reagents_add = list("cyanide" = 0.5, "vitamin" = 0.04, "nutriment" = 0.1)
rarity = 50 // Source of cyanide, and hard (almost impossible) to obtain normally.
/obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index 03f032111f3..2bbac360b09 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -64,7 +64,7 @@
product = /obj/item/weapon/reagent_containers/food/snacks/grown/banana/mime
growthstages = 4
mutatelist = list()
- reagents_add = list("nothing" = 0.1, "mutetoxin" = 0.1, "nutriment" = 0.02)
+ reagents_add = list("nothing" = 0.1, "capulettium_plus" = 0.1, "nutriment" = 0.02)
rarity = 15
/obj/item/weapon/reagent_containers/food/snacks/grown/banana/mime
diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm
index f1cab9da580..8e08e23efdd 100644
--- a/code/modules/hydroponics/grown/cannabis.dm
+++ b/code/modules/hydroponics/grown/cannabis.dm
@@ -17,7 +17,7 @@
/obj/item/seeds/cannabis/death,
/obj/item/seeds/cannabis/white,
/obj/item/seeds/cannabis/ultimate)
- reagents_add = list("space_drugs" = 0.15, "lipolicide" = 0.35) // gives u the munchies
+ reagents_add = list("thc" = 0.15)
/obj/item/seeds/cannabis/rainbow
@@ -28,7 +28,7 @@
plantname = "Rainbow Weed"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/rainbow
mutatelist = list()
- reagents_add = list("mindbreaker" = 0.15, "lipolicide" = 0.35)
+ reagents_add = list("lsd" = 0.15, "thc" = 0.15)
rarity = 40
/obj/item/seeds/cannabis/death
@@ -39,7 +39,7 @@
plantname = "Deathweed"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/death
mutatelist = list()
- reagents_add = list("cyanide" = 0.35, "space_drugs" = 0.15, "lipolicide" = 0.15)
+ reagents_add = list("cyanide" = 0.35, "thc" = 0.15)
rarity = 40
/obj/item/seeds/cannabis/white
@@ -50,7 +50,7 @@
plantname = "Lifeweed"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/white
mutatelist = list()
- reagents_add = list("omnizine" = 0.35, "space_drugs" = 0.15, "lipolicide" = 0.15)
+ reagents_add = list("omnizine" = 0.35, "thc" = 0.15)
rarity = 40
@@ -63,14 +63,13 @@
product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/ultimate
mutatelist = list()
reagents_add = list("space_drugs" = 0.3,
- "mindbreaker" = 0.3,
+ "lsd" = 0.3,
"mercury" = 0.15,
"lithium" = 0.15,
"atropine" = 0.15,
"haloperidol" = 0.15,
"methamphetamine" = 0.15,
"capsaicin" = 0.15,
- "barbers_aid" = 0.15,
"bath_salts" = 0.15,
"itching_powder" = 0.15,
"crank" = 0.15,
diff --git a/code/modules/hydroponics/grown/kudzu.dm b/code/modules/hydroponics/grown/kudzu.dm
index a09e83ae955..e417d1868a5 100644
--- a/code/modules/hydroponics/grown/kudzu.dm
+++ b/code/modules/hydroponics/grown/kudzu.dm
@@ -77,7 +77,7 @@
if(S.has_reagent("blood", 15))
production = Clamp(production + rand(15, -5),1,10)
- if(S.has_reagent("amatoxin", 5))
+ if(S.has_reagent("amanitin", 5))
production = Clamp(production + rand(5, -15),1,10)
if(S.has_reagent("plasma", 5))
diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm
index 016a6071aa0..51d020bc812 100644
--- a/code/modules/hydroponics/grown/mushrooms.dm
+++ b/code/modules/hydroponics/grown/mushrooms.dm
@@ -47,7 +47,7 @@
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
mutatelist = list(/obj/item/seeds/angel)
- reagents_add = list("mushroomhallucinogen" = 0.04, "amatoxin" = 0.35, "nutriment" = 0, "growthserum" = 0.1)
+ reagents_add = list("psilocybin" = 0.04, "amanitin" = 0.35, "nutriment" = 0, "growthserum" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita
seed = /obj/item/seeds/amanita
@@ -74,7 +74,7 @@
growthstages = 3
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
- reagents_add = list("mushroomhallucinogen" = 0.04, "amatoxin" = 0.1, "nutriment" = 0, "amanitin" = 0.2)
+ reagents_add = list("psilocybin" = 0.04, "amanitin" = 0.1, "nutriment" = 0, "amanitin" = 0.2)
rarity = 30
origin_tech = "biotech=5"
@@ -101,7 +101,7 @@
growthstages = 3
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
- reagents_add = list("mushroomhallucinogen" = 0.25, "nutriment" = 0.02)
+ reagents_add = list("psilocybin" = 0.25, "nutriment" = 0.02)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap
seed = /obj/item/seeds/liberty
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index 99e6f61431c..d7984031052 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -156,7 +156,7 @@
var/counter
for(counter=0, counter<=powerlevel, counter++)
var/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/S = new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc)
- S.reagents.add_reagent("mushroomhallucinogen", powerlevel)
+ S.reagents.add_reagent("psilocybin", powerlevel)
S.reagents.add_reagent("omnizine", powerlevel)
S.reagents.add_reagent("synaptizine", powerlevel)
qdel(src)
\ No newline at end of file
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index e2e97437b68..2b627cda9c4 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -1,34 +1,6 @@
// the power cell
// charge from 0 to 100%
// fits in APC to provide backup power
-/obj/item/weapon/stock_parts/cell/var/image/overlay_image
-
-/obj/item/weapon/stock_parts/cell/New()
- ..()
- processing_objects.Add(src)
- charge = maxcharge
-
- spawn(5)
- updateicon()
-
-/obj/item/weapon/stock_parts/cell/Destroy()
- processing_objects.Remove(src)
- return ..()
-
-/obj/item/weapon/stock_parts/cell/proc/updateicon()
- if(isnull(src.overlay_image))
- src.overlay_image = image('icons/obj/power.dmi')
- overlays.Cut()
-
- if(charge < 0.01)
- return
- else if(charge/maxcharge >=0.995)
- src.overlay_image.icon_state = "cell-o2"
- overlays += src.overlay_image
- else
- src.overlay_image.icon_state = "cell-o1"
- overlays += src.overlay_image
-
/obj/item/weapon/stock_parts/cell/proc/percent() // return % charge of cell
return 100.0*charge/maxcharge
diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm
index df34a279caf..ee5a02ad142 100644
--- a/code/modules/projectiles/ammunition/ammo_casings.dm
+++ b/code/modules/projectiles/ammunition/ammo_casings.dm
@@ -247,7 +247,7 @@
..()
reagents.add_reagent("neurotoxin", 6)
reagents.add_reagent("spore", 6)
- reagents.add_reagent("mutetoxin", 6) //;HELP OPS IN MAINT
+ reagents.add_reagent("capulettium_plus", 6) //;HELP OPS IN MAINT
reagents.add_reagent("coniine", 6)
reagents.add_reagent("sodium_thiopental", 6)
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 9c3475d2141..c75a1139446 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -197,7 +197,7 @@
nodamage = 1
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
hitsound = 'sound/items/bikehorn.ogg'
- icon = 'icons/obj/harvest.dmi'
+ icon = 'icons/obj/hydroponics/harvest.dmi'
icon_state = "banana"
range = 200
diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm
index fa37e5544e7..499f5e4eddd 100644
--- a/code/modules/reagents/chemistry/reagents/food.dm
+++ b/code/modules/reagents/chemistry/reagents/food.dm
@@ -282,6 +282,14 @@
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#302000" // rgb: 48, 32, 0
+/datum/reagent/consumable/vanilla
+ name = "Vanilla Powder"
+ id = "vanilla"
+ description = "A fatty, bitter paste made from vanilla pods."
+ reagent_state = SOLID
+ nutriment_factor = 5 * REAGENTS_METABOLISM
+ color = "#FFFACD"
+
/datum/reagent/consumable/hot_coco
name = "Hot Chocolate"
id = "hot_coco"
diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm
index fc966c7fba3..5fbcea30c27 100644
--- a/code/modules/reagents/chemistry/reagents/medicine.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine.dm
@@ -878,38 +878,10 @@
..()
/datum/reagent/medicine/omnizine_diluted/overdose_process(mob/living/M, severity)
- var/effect = ..()
- if(severity == 1) //lesser
- M.stuttering += 1
- if(effect <= 1)
- M.visible_message("[M] suddenly cluches their gut!")
- M.emote("scream")
- M.Stun(4)
- M.Weaken(4)
- else if(effect <= 3)
- M.visible_message("[M] completely spaces out for a moment.")
- M.AdjustConfused(15)
- else if(effect <= 5)
- M.visible_message("[M] stumbles and staggers.")
- M.Dizzy(5)
- M.Weaken(3)
- else if(effect <= 7)
- M.visible_message("[M] shakes uncontrollably.")
- M.Jitter(30)
- else if(severity == 2) // greater
- if(effect <= 2)
- M.visible_message("[M] suddenly cluches their gut!")
- M.emote("scream")
- M.Stun(7)
- M.Weaken(7)
- else if(effect <= 5)
- M.visible_message("[M] jerks bolt upright, then collapses!")
- M.Paralyse(5)
- M.Weaken(4)
- else if(effect <= 8)
- M.visible_message("[M] stumbles and staggers.")
- M.Dizzy(5)
- M.Weaken(3)
+ M.adjustToxLoss(1.5*REAGENTS_EFFECT_MULTIPLIER)
+ M.adjustOxyLoss(1.5*REAGENTS_EFFECT_MULTIPLIER)
+ M.adjustBruteLoss(1.5*REAGENTS_EFFECT_MULTIPLIER)
+ M.adjustFireLoss(1.5*REAGENTS_EFFECT_MULTIPLIER)
//virus-specific symptom reagents
@@ -974,4 +946,61 @@
/datum/reagent/medicine/liquid_solder/on_mob_life(mob/living/M)
M.adjustBrainLoss(-3)
- ..()
\ No newline at end of file
+ ..()
+
+
+
+//Trek-Chems. DO NOT USE THES OUTSIDE OF BOTANY OR FOR VERY SPECIFIC PURPOSES. NEVER GIVE A RECIPE UNDER ANY CIRCUMSTANCES//
+/datum/reagent/medicine/bicaridine
+ name = "Bicaridine"
+ id = "bicaridine"
+ description = "Restores bruising. Overdose causes it instead."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ overdose_threshold = 30
+
+/datum/reagent/medicine/bicaridine/on_mob_life(mob/living/M)
+ M.adjustBruteLoss(-2*REAGENTS_EFFECT_MULTIPLIER)
+ ..()
+
+/datum/reagent/medicine/bicaridine/overdose_process(mob/living/M)
+ M.adjustBruteLoss(4*REAGENTS_EFFECT_MULTIPLIER)
+
+/datum/reagent/medicine/kelotane
+ name = "Kelotane"
+ id = "kelotane"
+ description = "Restores fire damage. Overdose causes it instead."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ overdose_threshold = 30
+
+/datum/reagent/medicine/kelotane/on_mob_life(mob/living/M)
+ M.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER)
+ ..()
+
+/datum/reagent/medicine/kelotane/overdose_process(mob/living/M)
+ M.adjustFireLoss(4*REAGENTS_EFFECT_MULTIPLIER)
+
+
+/datum/reagent/medicine/earthsblood //Created by ambrosia gaia plants
+ name = "Earthsblood"
+ id = "earthsblood"
+ description = "Ichor from an extremely powerful plant. Great for restoring wounds, but it's a little heavy on the brain."
+ color = "#FFAF00"
+ overdose_threshold = 25
+
+/datum/reagent/medicine/earthsblood/on_mob_life(mob/living/M)
+ M.adjustBruteLoss(-3 * REAGENTS_EFFECT_MULTIPLIER)
+ M.adjustFireLoss(-3 * REAGENTS_EFFECT_MULTIPLIER)
+ M.adjustOxyLoss(-15 * REAGENTS_EFFECT_MULTIPLIER)
+ M.adjustToxLoss(-3 * REAGENTS_EFFECT_MULTIPLIER)
+ M.adjustBrainLoss(2 * REAGENTS_EFFECT_MULTIPLIER) //This does, after all, come from ambrosia, and the most powerful ambrosia in existence, at that!
+ M.adjustCloneLoss(-1 * REAGENTS_EFFECT_MULTIPLIER)
+ M.adjustStaminaLoss(-30 * REAGENTS_EFFECT_MULTIPLIER)
+ M.SetJitter(min(max(0, M.jitteriness + 3), 30))
+ M.SetDruggy(min(max(0, M.druggy + 10), 15)) //See above
+ ..()
+
+/datum/reagent/medicine/earthsblood/overdose_process(mob/living/M)
+ M.SetHallucinate(min(max(0, M.hallucination + 10), 50))
+ M.adjustToxLoss(5 * REAGENTS_EFFECT_MULTIPLIER)
\ No newline at end of file
diff --git a/code/modules/reagents/chemistry/reagents/misc.dm b/code/modules/reagents/chemistry/reagents/misc.dm
index bb386d0215c..a3a04d2a41b 100644
--- a/code/modules/reagents/chemistry/reagents/misc.dm
+++ b/code/modules/reagents/chemistry/reagents/misc.dm
@@ -415,6 +415,37 @@
M.say(pick("Bzzz...","BZZ BZZ","Bzzzzzzzzzzz..."))
..()
+/datum/reagent/growthserum
+ name = "Growth serum"
+ id = "growthserum"
+ description = "A commercial chemical designed to help older men in the bedroom." //not really it just makes you a giant
+ color = "#ff0000"//strong red. rgb 255, 0, 0
+ var/current_size = 1
+
+/datum/reagent/growthserum/on_mob_life(mob/living/carbon/H)
+ var/newsize = current_size
+ switch(volume)
+ if(0 to 19)
+ newsize = 1.25
+ if(20 to 49)
+ newsize = 1.5
+ if(50 to 99)
+ newsize = 2
+ if(100 to 199)
+ newsize = 2.5
+ if(200 to INFINITY)
+ newsize = 3.5
+
+ H.resize = newsize/current_size
+ current_size = newsize
+ H.update_transform()
+ ..()
+
+/datum/reagent/growthserum/on_mob_delete(mob/living/M)
+ M.resize = 1/current_size
+ M.update_transform()
+ ..()
+
/datum/reagent/toxin/coffeepowder
name = "Coffee Grounds"
id = "coffeepowder"
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index cb7d7c0b958..f9b5560caed 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -944,6 +944,26 @@
D.adjustHealth(100)
..()
+/datum/reagent/pestkiller // To-Do; make this more realistic.
+ name = "Pest Killer"
+ id = "pestkiller"
+ description = "A harmful toxic mixture to kill pests. Do not ingest!"
+ color = "#4B004B" // rgb: 75, 0, 75
+
+/datum/reagent/pestkiller/on_mob_life(mob/living/M)
+ M.adjustToxLoss(1)
+ ..()
+
+/datum/reagent/pestkiller/reaction_mob(mob/living/M, method=TOUCH, volume)
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ if(!C.wear_mask) // If not wearing a mask
+ C.adjustToxLoss(2)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ if(H.get_species() == "Kidan") //RIP
+ H.adjustToxLoss(20)
+
/datum/reagent/capulettium
name = "Capulettium"
id = "capulettium"
diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm
index 2181401b2da..682217c6c8d 100644
--- a/code/modules/reagents/chemistry/recipes/toxins.dm
+++ b/code/modules/reagents/chemistry/recipes/toxins.dm
@@ -101,6 +101,14 @@
result_amount = 3
mix_message = "The mixture gives off a harsh odor"
+/datum/chemical_reaction/pestkiller // To-Do make this more realistic
+ name = "Pest Killer"
+ id = "pestkiller"
+ result = "pestkiller"
+ required_reagents = list("toxin" = 1, "ethanol" = 4)
+ result_amount = 5
+ mix_message = "The mixture gives off a harsh odor"
+
/datum/chemical_reaction/capulettium
name = "capulettium"
id = "capulettium"
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index f429b7898f9..f65e4a87dc2 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -127,7 +127,7 @@
/obj/item/weapon/reagent_containers/spray/waterflower
name = "water flower"
desc = "A seemingly innocent sunflower...with a twist."
- icon = 'icons/obj/harvest.dmi'
+ icon = 'icons/obj/hydroponics/harvest.dmi'
icon_state = "sunflower"
item_state = "sunflower"
amount_per_transfer_from_this = 1
diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi
index 850411d79e9..5977cd3cb66 100644
Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ