diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index a18d62d270f..8ba5ffc8147 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -278,6 +278,23 @@ plant_type = 0 growthstages = 6 +/obj/item/seeds/bluespacetomatoseed + name = "pack of blue-space tomato seeds" + desc = "These seeds grow into blue-space tomato plants." + icon_state = "seed-bluespacetomato" + mypath = "/obj/item/seeds/bluespacetomatoseed" + species = "bluespacetomato" + plantname = "Blue-Space Tomato Plants" + productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/bluespacetomato" + lifespan = 25 + endurance = 15 + maturation = 8 + production = 6 + yield = 2 + potency = 10 + plant_type = 0 + growthstages = 6 + /obj/item/seeds/cornseed name = "pack of corn seeds" desc = "I don't mean to sound corny..." @@ -1143,46 +1160,6 @@ reagents.add_reagent("coco", 4+round((potency / 5), 1)) bitesize = 1+round(reagents.total_volume / 2, 1) -//This object is just a transition object. All it does is make a grass tile and delete itself. -/obj/item/weapon/reagent_containers/food/snacks/grown/grass - seed = "/obj/item/seeds/grassseed" - name = "grass" - desc = "Green and lush." - icon_state = "spawner" - potency = 20 - New() - new/obj/item/stack/tile/grass(src.loc) - spawn(5) //Workaround to keep harvesting from working weirdly. - del(src) - -//This object is just a transition object. All it does is make dosh and delete itself. -Cheridan -/obj/item/weapon/reagent_containers/food/snacks/grown/money - seed = "/obj/item/seeds/cashseed" - name = "dosh" - desc = "Green and lush." - icon_state = "spawner" - potency = 10 - New() - switch(rand(1,100))//(potency) //It wants to use the default potency instead of the new, so it was always 10. Will try to come back to this later - Cheridan - if(0 to 10) - new/obj/item/weapon/spacecash/(src.loc) - if(11 to 20) - new/obj/item/weapon/spacecash/c10(src.loc) - if(21 to 30) - new/obj/item/weapon/spacecash/c20(src.loc) - if(31 to 40) - new/obj/item/weapon/spacecash/c50(src.loc) - if(41 to 50) - new/obj/item/weapon/spacecash/c100(src.loc) - if(51 to 60) - new/obj/item/weapon/spacecash/c200(src.loc) - if(61 to 80) - new/obj/item/weapon/spacecash/c500(src.loc) - else - new/obj/item/weapon/spacecash/c1000(src.loc) - spawn(5) //Workaround to keep harvesting from working weirdly. - del(src) - /obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane seed = "/obj/item/seeds/sugarcaneseed" name = "sugarcane" @@ -1985,3 +1962,99 @@ New() src.pixel_x = rand(-5.0, 5) src.pixel_y = rand(-5.0, 5) + + +// ************************************* +// Complex Grown Object Defines - +// Putting these at the bottom so they don't clutter the list up. -Cheridan +// ************************************* + +//This object is just a transition object. All it does is make a grass tile and delete itself. +/obj/item/weapon/reagent_containers/food/snacks/grown/grass + seed = "/obj/item/seeds/grassseed" + name = "grass" + desc = "Green and lush." + icon_state = "spawner" + potency = 20 + New() + new/obj/item/stack/tile/grass(src.loc) + spawn(5) //Workaround to keep harvesting from working weirdly. + del(src) + +//This object is just a transition object. All it does is make dosh and delete itself. -Cheridan +/obj/item/weapon/reagent_containers/food/snacks/grown/money + seed = "/obj/item/seeds/cashseed" + name = "dosh" + desc = "Green and lush." + icon_state = "spawner" + potency = 10 + New() + switch(rand(1,100))//(potency) //It wants to use the default potency instead of the new, so it was always 10. Will try to come back to this later - Cheridan + if(0 to 10) + new/obj/item/weapon/spacecash/(src.loc) + if(11 to 20) + new/obj/item/weapon/spacecash/c10(src.loc) + if(21 to 30) + new/obj/item/weapon/spacecash/c20(src.loc) + if(31 to 40) + new/obj/item/weapon/spacecash/c50(src.loc) + if(41 to 50) + new/obj/item/weapon/spacecash/c100(src.loc) + if(51 to 60) + new/obj/item/weapon/spacecash/c200(src.loc) + if(61 to 80) + new/obj/item/weapon/spacecash/c500(src.loc) + else + new/obj/item/weapon/spacecash/c1000(src.loc) + spawn(5) //Workaround to keep harvesting from working weirdly. + del(src) + +/obj/item/weapon/reagent_containers/food/snacks/grown/bluespacetomato + seed = "/obj/item/seeds/bluespacetomatoseed" + name = "blue-space tomato" + desc = "So lubricated, you might slip through space-time." + icon_state = "bluespacetomato" + potency = 10 + origin_tech = "bluespace=3" + New() + ..() + reagents.add_reagent("nutriment", 1+round((potency / 20), 1)) + reagents.add_reagent("singulo", 1+round((potency / 5), 1)) + bitesize = 1+round(reagents.total_volume / 2, 1) + + throw_impact(atom/hit_atom) + ..() + var/mob/M = usr + var/outer_teleport_radius = potency/10 //Plant potency determines radius of teleport. + var/inner_teleport_radius = potency/15 + var/list/turfs = new/list() + for(var/turf/T in orange(M,outer_teleport_radius)) + if(T in orange(M,inner_teleport_radius)) continue + if(istype(T,/turf/space)) continue + if(T.density) continue + if(T.x>world.maxx-outer_teleport_radius || T.xworld.maxy-outer_teleport_radius || T.yThe [src.name] has been squashed, causing a distortion in space-time.","You hear a smack.") + del(src) + return \ No newline at end of file diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index f2062bb2258..1efd35857e3 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -349,6 +349,10 @@ obj/machinery/hydroponics/proc/mutatespecie() // Mutagent produced a new plant! if(71 to 100) src.myseed = new /obj/item/seeds/killertomatoseed + else if ( istype(src.myseed, /obj/item/seeds/bluetomatoseed )) + del(src.myseed) + src.myseed = new /obj/item/seeds/bluespacetomatoseed + else if ( istype(src.myseed, /obj/item/seeds/grapeseed )) del(src.myseed) src.myseed = new /obj/item/seeds/greengrapeseed diff --git a/code/game/objects/storage/storage.dm b/code/game/objects/storage/storage.dm index cbba2e239fb..b9184b5ee06 100644 --- a/code/game/objects/storage/storage.dm +++ b/code/game/objects/storage/storage.dm @@ -173,9 +173,13 @@ src.icon_state = "giftbag2" if (istype(W, /obj/item/weapon/gun/energy/crossbow)) return //STEALTHY - for(var/mob/O in viewers(user, null)) - O.show_message(text("\blue [user] has added [W] to [src]!")) - //Foreach goto(139) + for(var/mob/M in viewers(user, null)) + if (M == user) + user << "\blue You put the [W] into [src]." + else if (M in range(1)) //If someone is standing close enough, they can tell what it is... + M.show_message(text("\blue [user] puts [W] into [src].")) + else if (W.w_class >= 3.0) //Otherwise they can only see large or normal items from a distance... + M.show_message(text("\blue [user] puts [W] into [src].")) return /obj/item/weapon/storage/dropped(mob/user as mob) @@ -390,4 +394,4 @@ ..() return -//////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// \ No newline at end of file diff --git a/icons/obj/atmospherics/pipe_tank.dmi b/icons/obj/atmospherics/pipe_tank.dmi index 6ad5b198309..e6925d0edaf 100644 Binary files a/icons/obj/atmospherics/pipe_tank.dmi and b/icons/obj/atmospherics/pipe_tank.dmi differ diff --git a/icons/obj/harvest.dmi b/icons/obj/harvest.dmi index 55dcb8babd4..f17befa9c21 100644 Binary files a/icons/obj/harvest.dmi and b/icons/obj/harvest.dmi differ diff --git a/icons/obj/hydroponics.dmi b/icons/obj/hydroponics.dmi index 8953fdd5cd3..ec01c97b673 100644 Binary files a/icons/obj/hydroponics.dmi and b/icons/obj/hydroponics.dmi differ diff --git a/icons/obj/seeds.dmi b/icons/obj/seeds.dmi index 1ad1660a657..26589bcfb8c 100644 Binary files a/icons/obj/seeds.dmi and b/icons/obj/seeds.dmi differ