diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 8e2e98b362b..ac97147c4c9 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -79,6 +79,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/storage/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 @@ -266,6 +267,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_store) return 1 diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm index 901fbecbcf5..104274ab246 100755 --- a/code/game/objects/devices/PDA/PDA.dm +++ b/code/game/objects/devices/PDA/PDA.dm @@ -125,6 +125,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 401b5ad03e8..1cbde9ffcef 100644 --- a/code/game/objects/devices/PDA/cart.dm +++ b/code/game/objects/devices/PDA/cart.dm @@ -13,6 +13,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 = "" @@ -73,6 +74,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 3562372a94a..75aa27e081d 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -2288,6 +2288,25 @@ var/list/data = list("viruses"= list(F)) reagents.add_reagent("blood", 20, data) +/obj/item/weapon/reagent_containers/glass/bottle/pacid + name = "Polytrinic Acid Bottle" + desc = "A small bottle. Contains a small amount of Polytronic Acid" + icon = 'chemical.dmi' + icon_state = "bottle17" + New() + ..() + 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/bottle/ert name = "emergency medicine bottle" desc = "A large bottle." diff --git a/icons/effects/genetics.dmi b/icons/effects/genetics.dmi index aca76b630a1..ab2916710ac 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 017702505ce..a13fe588bdf 100644 Binary files a/icons/obj/aibots.dmi and b/icons/obj/aibots.dmi differ diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi index ca977fddff0..27458a2ee8e 100644 Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ