diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 456ceddb6ec..a18d62d270f 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -400,7 +400,7 @@ potency = 10 oneharvest = 1 plant_type = 0 - growthstages = 5 + growthstages = 3 /obj/item/seeds/amanitamycelium name = "pack of fly amanita mycelium" diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 470d3abf515..bb8a27a060f 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -75,6 +75,7 @@ H.equip_if_possible(new /obj/item/clothing/gloves/botanic_leather(H), H.slot_gloves) H.equip_if_possible(new /obj/item/clothing/suit/apron(H), H.slot_wear_suit) H.equip_if_possible(new /obj/item/device/analyzer/plant_analyzer(H), H.slot_s_store) + H.equip_if_possible(new /obj/item/device/pda/botanist(H), H.slot_belt) return 1 @@ -261,6 +262,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_if_possible(new /obj/item/clothing/under/suit_jacket/red(H), H.slot_w_uniform) + H.equip_if_possible(new /obj/item/device/pda/librarian(H), H.slot_belt) H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes) H.equip_if_possible(new /obj/item/weapon/barcodescanner(H), H.slot_l_hand) return 1 diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index 9cb26f9529a..f2062bb2258 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -104,11 +104,11 @@ obj/machinery/hydroponics/process() if(src.age > src.myseed.production && (src.age - src.lastproduce) > src.myseed.production && (!src.harvest && !src.dead)) var/m_count = 0 while(m_count < src.mutmod) - if(prob(89)) + if(prob(85)) src.mutate() else if(prob(30)) src.hardmutate() - else if(prob(1)) + else if(prob(5)) src.mutatespecie() m_count++; if(src.yieldmod > 0 && src.myseed.yield != -1) // Unharvestable shouldn't be harvested @@ -608,6 +608,21 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) if (1 to 10) src.mutatepest() else user << "Nothing happens..." + // The best stuff there is. For testing/debugging. + + if(S.reagents.has_reagent("adminordrazine", 1)) + src.waterlevel += round(S.reagents.get_reagent_amount("adminordrazine")*1) + src.health += round(S.reagents.get_reagent_amount("adminordrazine")*1) + src.nutrilevel += round(S.reagents.get_reagent_amount("adminordrazine")*1) + src.pestlevel -= rand(1,5) + src.weedlevel -= rand(1,5) + if(S.reagents.has_reagent("adminordrazine", 5)) + switch(rand(100)) + if (66 to 100) src.mutatespecie() + if (33 to 65) src.mutateweed() + if (1 to 32) src.mutatepest() + else user << "Nothing happens..." + S.reagents.clear_reagents() if (src.weedlevel < 0 ) // Make sure it won't go overoboard src.weedlevel = 0 diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm index bfbb7e84425..1599d18be79 100644 --- a/code/game/objects/devices/PDA/PDA.dm +++ b/code/game/objects/devices/PDA/PDA.dm @@ -124,6 +124,16 @@ icon_state = "pda-lawyer" ttone = "objection" +/obj/item/device/pda/botanist + //default_cartridge = /obj/item/weapon/cartridge/botanist + icon_state = "pda-hydro" + +/obj/item/device/pda/librarian + icon_state = "pda-libb" + desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a WGW-11 series e-reader." + note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant!" + silent = 1 //Quiet in the library! + /* * The Actual PDA */ diff --git a/code/game/objects/devices/PDA/cart.dm b/code/game/objects/devices/PDA/cart.dm index dfa104c7df2..6124ae9ab7e 100644 --- a/code/game/objects/devices/PDA/cart.dm +++ b/code/game/objects/devices/PDA/cart.dm @@ -14,6 +14,7 @@ var/access_clown = 0 var/access_mime = 0 var/access_janitor = 0 +// var/access_flora = 0 var/access_reagent_scanner = 0 var/access_remote_door = 0 //Control some blast doors remotely!! var/remote_door_id = "" @@ -75,6 +76,12 @@ icon_state = "cart-mi" access_mime = 1 var/mime_charges = 5 +/* + botanist + name = "Green Thumb v4.20" + icon_state = "cart-b" + access_flora = 1 +*/ signal name = "generic signaler cartridge" diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index ae7535db5b5..ca113e1cc58 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -2130,7 +2130,7 @@ reagents.add_reagent("blood", 20, data) /obj/item/weapon/reagent_containers/glass/bottle/pacid - name = "Polytronic Acid Bottle" + name = "Polytrinic Acid Bottle" desc = "A small bottle. Contains a small amount of Polytronic Acid" icon = 'chemical.dmi' icon_state = "bottle17" @@ -2138,6 +2138,15 @@ ..() reagents.add_reagent("pacid", 30) +/obj/item/weapon/reagent_containers/glass/bottle/adminordrazine + name = "Adminordrazine Bottle" + desc = "A small bottle. Contains the liquid essence of the gods." + icon = 'drinks.dmi' + icon_state = "holyflask" + New() + ..() + reagents.add_reagent("adminordrazine", 30) + /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone name = "beaker" diff --git a/icons/effects/genetics.dmi b/icons/effects/genetics.dmi index 524093c8bc9..d3a611d5ed1 100644 Binary files a/icons/effects/genetics.dmi and b/icons/effects/genetics.dmi differ diff --git a/icons/obj/aibots.dmi b/icons/obj/aibots.dmi index 04149c91171..407049ae2d9 100644 Binary files a/icons/obj/aibots.dmi and b/icons/obj/aibots.dmi differ diff --git a/icons/obj/hydroponics.dmi b/icons/obj/hydroponics.dmi index d1a570e3c53..8953fdd5cd3 100644 Binary files a/icons/obj/hydroponics.dmi and b/icons/obj/hydroponics.dmi differ diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi index ca977fddff0..bf4568f0e1f 100644 Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ