diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm index 25e9e34bc05..6beca32353c 100644 --- a/_maps/RandomZLevels/Academy.dmm +++ b/_maps/RandomZLevels/Academy.dmm @@ -175,7 +175,7 @@ "ds" = (/obj/structure/chair/wood/normal{dir = 1},/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) "dt" = (/turf/simulated/floor/plasteel{icon_state = "green"; dir = 8},/area/awaymission/academy/classrooms) "du" = (/obj/structure/chair/stool,/turf/simulated/floor/plasteel,/area/awaymission/academy/classrooms) -"dv" = (/obj/item/seeds/eggyseed,/obj/machinery/hydroponics/constructable,/turf/simulated/floor/plasteel,/area/awaymission/academy/classrooms) +"dv" = (/obj/item/seeds/eggplant/eggy,/obj/machinery/hydroponics/constructable,/turf/simulated/floor/plasteel,/area/awaymission/academy/classrooms) "dw" = (/obj/machinery/hydroponics/constructable,/turf/simulated/floor/plasteel,/area/awaymission/academy/classrooms) "dx" = (/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/awaymission/academy/classrooms) "dy" = (/mob/living/simple_animal/hostile/wizard,/turf/simulated/floor/plasteel,/area/awaymission/academy/headmaster) @@ -192,7 +192,7 @@ "dJ" = (/obj/machinery/hydroponics/constructable,/obj/item/seeds/replicapod,/turf/simulated/floor/plasteel,/area/awaymission/academy/classrooms) "dK" = (/turf/simulated/floor/engine/cult,/area/awaymission/academy/academycellar) "dL" = (/obj/structure/chair{dir = 8},/turf/simulated/floor/plasteel,/area/awaymission/academy/classrooms) -"dM" = (/obj/machinery/hydroponics/constructable,/obj/item/seeds/bluespacetomatoseed,/turf/simulated/floor/plasteel,/area/awaymission/academy/classrooms) +"dM" = (/obj/machinery/hydroponics/constructable,/obj/item/seeds/tomato/blue/bluespace,/turf/simulated/floor/plasteel,/area/awaymission/academy/classrooms) "dN" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel,/area/awaymission/academy/classrooms) "dO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/awaymission/academy/classrooms) "dP" = (/obj/machinery/door/airlock/freezer,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/awaymission/academy/classrooms) @@ -620,7 +620,7 @@ "lV" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/awaymission/academy/academyengine) "lW" = (/obj/structure/ladder/unbreakable/rune{height = 1; id = "academy_storage"},/turf/simulated/floor/plating,/area/awaymission/academy/classrooms) "lX" = (/obj/structure/ladder/unbreakable/rune{height = 1; id = "academy_coldroom"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/awaymission/academy/classrooms) -"lY" = (/obj/structure/table/wood,/obj/item/seeds/kudzuseed,/turf/simulated/floor/plasteel,/area/awaymission/academy/classrooms) +"lY" = (/obj/structure/table/wood,/obj/item/seeds/kudzu,/turf/simulated/floor/plasteel,/area/awaymission/academy/classrooms) "lZ" = (/obj/structure/bookcase/random,/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) "ma" = (/obj/structure/ladder/unbreakable/rune{height = 1; id = "academy_cellar"},/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) "mb" = (/obj/structure/ladder/unbreakable/rune{height = 1; id = "academy_engine"},/turf/simulated/floor/plasteel,/area/awaymission/academy/academyaft) diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index 797d5a99c06..545d657f2f0 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -1697,7 +1697,7 @@ "aGG" = (/obj/structure/transit_tube{icon_state = "Block"; dir = 8},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aGH" = (/obj/structure/table/glass,/obj/item/weapon/hatchet,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aGI" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) -"aGJ" = (/obj/structure/closet/crate/hydroponics,/obj/item/seeds/carrotseed,/obj/item/seeds/cornseed,/obj/item/seeds/berryseed,/obj/item/seeds/watermelonseed,/obj/item/seeds/ambrosiavulgarisseed,/obj/item/seeds/wheatseed,/obj/item/seeds/grapeseed,/obj/item/seeds/grassseed,/obj/item/seeds/moonflowerseed,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) +"aGJ" = (/obj/structure/closet/crate/hydroponics,/obj/item/seeds/carrot,/obj/item/seeds/corn,/obj/item/seeds/berry,/obj/item/seeds/watermelon,/obj/item/seeds/ambrosia,/obj/item/seeds/wheat,/obj/item/seeds/grape,/obj/item/seeds/grass,/obj/item/seeds/sunflower/moonflower,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aGK" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor,/obj/structure/sign/directions/security{dir = 8; pixel_y = 40},/obj/structure/sign/directions/science{dir = 8; pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 1},/area/hallway/secondary/construction{name = "Fore Central Hallway"}) "aGL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light{dir = 8},/turf/simulated/floor/plasteel{dir = 1; icon_state = "greencorner"},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "aGM" = (/obj/structure/rack,/obj/item/clothing/suit/fire/firefighter,/obj/item/clothing/mask/gas,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) @@ -2664,7 +2664,7 @@ "aZm" = (/obj/machinery/biogenerator,/obj/structure/window/reinforced{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "green"},/area/security/prison) "aZn" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "green"},/area/security/prison) "aZo" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "green"},/area/security/prison) -"aZp" = (/obj/item/device/analyzer/plant_analyzer,/obj/structure/table,/obj/item/seeds/wheatseed,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/reagent_containers/spray/plantbgone{pixel_x = 6; pixel_y = 2},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 5},/area/security/prison) +"aZp" = (/obj/item/device/analyzer/plant_analyzer,/obj/structure/table,/obj/item/seeds/wheat,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/reagent_containers/spray/plantbgone{pixel_x = 6; pixel_y = 2},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 5},/area/security/prison) "aZq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "green"},/area/security/prison) "aZr" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel,/area/security/prison) "aZs" = (/obj/structure/chair/stool,/obj/machinery/button/door{id = "permabolt3"; name = "Cell Bolt Control"; normaldoorcontrol = 1; pixel_y = 25; req_access_txt = "0"; specialfunctions = 4},/turf/simulated/floor/plasteel,/area/security/prison) @@ -2820,9 +2820,9 @@ "bcm" = (/obj/item/device/radio/beacon,/turf/simulated/floor/plasteel,/area/bridge) "bcn" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/bridge) "bco" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/bridge) -"bcp" = (/obj/machinery/hydroponics/constructable,/obj/item/seeds/ambrosiavulgarisseed,/turf/simulated/floor/plasteel,/area/security/prison) +"bcp" = (/obj/machinery/hydroponics/constructable,/obj/item/seeds/ambrosia,/turf/simulated/floor/plasteel,/area/security/prison) "bcq" = (/obj/machinery/hydroponics/constructable,/obj/machinery/camera{c_tag = "Prison Aft"; dir = 1; network = list("SS13","Prison")},/turf/simulated/floor/plasteel,/area/security/prison) -"bcr" = (/obj/machinery/hydroponics/constructable,/obj/item/seeds/sunflowerseed,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/security/prison) +"bcr" = (/obj/machinery/hydroponics/constructable,/obj/item/seeds/sunflower,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/security/prison) "bcs" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "green"},/area/security/prison) "bct" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel,/area/security/prison) "bcu" = (/obj/machinery/button/door{name = "Cell 3 Lockdown"; pixel_x = -26; req_access_txt = "2"; id = "permacell3"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/security/prison) diff --git a/_maps/map_files/BirdStation/BirdStation.dmm b/_maps/map_files/BirdStation/BirdStation.dmm index c2708d47cb2..31ce3509737 100644 --- a/_maps/map_files/BirdStation/BirdStation.dmm +++ b/_maps/map_files/BirdStation/BirdStation.dmm @@ -2653,7 +2653,7 @@ "aZc" = (/obj/machinery/biogenerator,/turf/simulated/floor/plasteel/white,/area/maintenance/fore{name = "Security Maintenance"}) "aZd" = (/obj/machinery/seed_extractor,/turf/simulated/floor/plasteel/white,/area/maintenance/fore{name = "Security Maintenance"}) "aZe" = (/obj/structure/sink/kitchen{desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; pixel_y = 28},/obj/item/weapon/reagent_containers/spray/plantbgone,/turf/simulated/floor/plasteel/white,/area/maintenance/fore{name = "Security Maintenance"}) -"aZf" = (/obj/structure/closet/crate/secure/hydroponics{req_access_txt = "35"},/obj/item/seeds/kudzuseed{potency = 0; production = 8},/obj/item/seeds/chilighost,/obj/item/seeds/deathberryseed,/obj/item/device/gps,/turf/simulated/floor/plasteel/white,/area/maintenance/fore{name = "Security Maintenance"}) +"aZf" = (/obj/structure/closet/crate/secure/hydroponics{req_access_txt = "35"},/obj/item/seeds/kudzu{potency = 0; production = 8},/obj/item/seeds/chili/ghost,/obj/item/seeds/berry/death,/obj/item/device/gps,/turf/simulated/floor/plasteel/white,/area/maintenance/fore{name = "Security Maintenance"}) "aZg" = (/obj/structure/cable/cyan{icon_state = "1-2"},/obj/machinery/camera/autoname{icon_state = "camera"; dir = 5},/turf/simulated/floor/wood,/area/security/brig) "aZh" = (/obj/structure/closet/secure_closet/detective,/obj/item/device/camera/detective,/turf/simulated/floor/wood,/area/security/brig) "aZi" = (/obj/structure/table/wood,/turf/simulated/floor/wood,/area/security/brig) @@ -2678,9 +2678,9 @@ "aZB" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka,/turf/simulated/floor/wood,/area/maintenance/fore{name = "Security Maintenance"}) "aZC" = (/obj/structure/chair/stool,/turf/simulated/floor/plating,/area/maintenance/fore{name = "Security Maintenance"}) "aZD" = (/obj/structure/cable/cyan{icon_state = "1-2"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel,/area/maintenance/fore{name = "Security Maintenance"}) -"aZE" = (/obj/machinery/hydroponics/soil,/obj/item/seeds/eggplantseed,/turf/simulated/floor/plasteel/white,/area/maintenance/fore{name = "Security Maintenance"}) +"aZE" = (/obj/machinery/hydroponics/soil,/obj/item/seeds/eggplant,/turf/simulated/floor/plasteel/white,/area/maintenance/fore{name = "Security Maintenance"}) "aZF" = (/obj/machinery/hydroponics/soil,/turf/simulated/floor/plasteel/white,/area/maintenance/fore{name = "Security Maintenance"}) -"aZG" = (/obj/item/seeds/cherryseed,/obj/item/seeds/chilighost,/obj/item/seeds/carrotseed,/obj/item/seeds/bananaseed{potency = 80},/obj/item/seeds/harebell,/obj/item/seeds/geraniumseed,/obj/item/seeds/geraniumseed,/obj/item/seeds/nettleseed,/obj/item/seeds/nettleseed,/turf/simulated/floor/plasteel/white,/area/maintenance/fore{name = "Security Maintenance"}) +"aZG" = (/obj/item/seeds/cherry,/obj/item/seeds/chili/ghost,/obj/item/seeds/carrot,/obj/item/seeds/banana{potency = 80},/obj/item/seeds/harebell,/obj/item/seeds/poppy/geranium,/obj/item/seeds/poppy/geranium,/obj/item/seeds/nettle,/obj/item/seeds/nettle,/turf/simulated/floor/plasteel/white,/area/maintenance/fore{name = "Security Maintenance"}) "aZH" = (/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/reagent_containers/glass/bucket,/obj/machinery/light/small{dir = 4},/obj/item/weapon/storage/bag/plants,/obj/item/weapon/cultivator,/turf/simulated/floor/plasteel/white,/area/maintenance/fore{name = "Security Maintenance"}) "aZI" = (/obj/machinery/door/airlock/security{name = "central security door"; req_one_access_txt = "1;2;4"},/obj/structure/cable/cyan{icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/fore{name = "Security Maintenance"}) "aZJ" = (/obj/structure/cable/cyan{icon_state = "1-4"},/turf/simulated/floor/plasteel,/area/maintenance/asmaint) diff --git a/_maps/map_files/DreamStation/dreamstation04.dmm b/_maps/map_files/DreamStation/dreamstation04.dmm index 3dde16f54f7..57faa9d91cb 100644 --- a/_maps/map_files/DreamStation/dreamstation04.dmm +++ b/_maps/map_files/DreamStation/dreamstation04.dmm @@ -3962,9 +3962,9 @@ "byj" = (/obj/machinery/door/poddoor/preopen{id = "permacell3"; name = "cell blast door"},/obj/machinery/door/airlock/glass{id_tag = "permabolt3"; name = "Cell 3"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "byk" = (/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "byl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) -"bym" = (/obj/machinery/hydroponics/soil,/obj/item/weapon/cultivator,/obj/item/seeds/steelmycelium,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) -"byn" = (/obj/machinery/hydroponics/soil,/obj/item/seeds/potatoseed,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) -"byo" = (/obj/machinery/hydroponics/soil,/obj/item/seeds/coffee_robusta_seed,/obj/item/device/analyzer/plant_analyzer,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"bym" = (/obj/machinery/hydroponics/soil,/obj/item/weapon/cultivator,/obj/item/seeds/steel,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"byn" = (/obj/machinery/hydroponics/soil,/obj/item/seeds/potato,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"byo" = (/obj/machinery/hydroponics/soil,/obj/item/seeds/coffee/robusta,/obj/item/device/analyzer/plant_analyzer,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "byp" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "byq" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0; tag = "w"},/turf/simulated/floor/plasteel/shuttle,/area/shuttle/escape) "byr" = (/turf/simulated/floor/plasteel/shuttle,/area/shuttle/escape) diff --git a/_maps/map_files/DreamStation/z5.dmm b/_maps/map_files/DreamStation/z5.dmm index 2893009316f..430d7b7c95d 100644 --- a/_maps/map_files/DreamStation/z5.dmm +++ b/_maps/map_files/DreamStation/z5.dmm @@ -87,7 +87,7 @@ "bI" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/mine/abandoned) "bJ" = (/obj/structure/sink{pixel_y = 30},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/mine/abandoned) "bK" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/mine/abandoned) -"bL" = (/obj/structure/table,/obj/item/weapon/paper/crumpled,/obj/item/seeds/cherryseed,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/mine/abandoned) +"bL" = (/obj/structure/table,/obj/item/weapon/paper/crumpled,/obj/item/seeds/cherry,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/mine/abandoned) "bM" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating/airless,/area/mine/abandoned) "bN" = (/obj/structure/alien/resin/membrane,/obj/structure/alien/weeds,/turf/simulated/floor/plating/airless,/area/mine/abandoned) "bO" = (/obj/item/clothing/mask/facehugger{icon_state = "facehugger_dead"; stat = 2},/obj/structure/alien/weeds,/turf/simulated/floor/plasteel/airless,/area/mine/abandoned) diff --git a/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm b/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm index ceece307873..7e709c845dc 100644 --- a/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm +++ b/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm @@ -44476,7 +44476,7 @@ dir = 4 }, /obj/machinery/hydroponics/soil, -/obj/item/seeds/ambrosiavulgarisseed, +/obj/item/seeds/ambrosia, /turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 9 @@ -46162,7 +46162,7 @@ /obj/structure/closet/crate/hydroponics, /obj/item/weapon/storage/bag/plants/portaseeder, /obj/item/weapon/cultivator, -/obj/item/seeds/cornseed, +/obj/item/seeds/corn, /turf/simulated/floor/plating, /area/maintenance/starboard) "bGm" = ( @@ -46207,7 +46207,7 @@ /area/maintenance/starboard) "bGp" = ( /obj/machinery/hydroponics/soil, -/obj/item/seeds/wheatseed, +/obj/item/seeds/wheat, /turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 8 @@ -57982,7 +57982,7 @@ }, /area/security/prison) "cci" = ( -/obj/item/seeds/ambrosiavulgarisseed, +/obj/item/seeds/ambrosia, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -58625,7 +58625,7 @@ dir = 1 }, /obj/machinery/hydroponics/soil, -/obj/item/seeds/grassseed, +/obj/item/seeds/grass, /turf/simulated/floor/grass, /area/security/prison) "cdH" = ( @@ -58847,7 +58847,7 @@ }, /area/security/prison) "ced" = ( -/obj/item/seeds/potatoseed, +/obj/item/seeds/potato, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -59091,7 +59091,7 @@ pixel_y = -32 }, /obj/machinery/hydroponics/soil, -/obj/item/seeds/carrotseed, +/obj/item/seeds/carrot, /turf/simulated/floor/grass, /area/security/prison) "ceD" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.v41I.dmm b/_maps/map_files/MetaStation/MetaStation.v41I.dmm index 88e1bbb54c6..6aafc048227 100644 --- a/_maps/map_files/MetaStation/MetaStation.v41I.dmm +++ b/_maps/map_files/MetaStation/MetaStation.v41I.dmm @@ -30,7 +30,7 @@ "aaD" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/flora/kirbyplants{layer = 4.1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "aaE" = (/obj/machinery/biogenerator,/obj/machinery/light/small{dir = 4},/obj/machinery/camera{c_tag = "Prison Hydroponics"; network = list("SS13","Prison")},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "aaF" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/security/prison) -"aaG" = (/obj/machinery/hydroponics/constructable,/obj/item/seeds/ambrosiavulgarisseed,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"aaG" = (/obj/machinery/hydroponics/constructable,/obj/item/seeds/ambrosia,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "aaH" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "aaI" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "aaJ" = (/obj/item/weapon/reagent_containers/glass/bucket,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) @@ -41,7 +41,7 @@ "aaO" = (/turf/simulated/wall/shuttle{icon_state = "swall_s10"; dir = 2},/area/shuttle/pod_2) "aaP" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/tracker,/turf/simulated/floor/plating/airless,/area/solar/auxstarboard) "aaQ" = (/turf/space,/area/security/prison) -"aaR" = (/obj/machinery/hydroponics/constructable,/obj/item/weapon/cultivator,/obj/item/seeds/carrotseed,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"aaR" = (/obj/machinery/hydroponics/constructable,/obj/item/weapon/cultivator,/obj/item/seeds/carrot,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "aaS" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "aaT" = (/turf/simulated/floor/plasteel,/area/security/prison) "aaU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) @@ -1928,7 +1928,7 @@ "aLd" = (/obj/machinery/biogenerator,/obj/machinery/firealarm{pixel_y = 27},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) "aLe" = (/obj/structure/table,/obj/item/weapon/cultivator,/obj/item/weapon/hatchet,/obj/item/weapon/crowbar,/obj/machinery/light{dir = 1},/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) "aLf" = (/obj/machinery/seed_extractor,/obj/machinery/airalarm{pixel_y = 23},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) -"aLg" = (/obj/item/seeds/appleseed,/obj/item/seeds/bananaseed,/obj/item/seeds/cocoapodseed,/obj/item/seeds/grapeseed,/obj/item/seeds/orangeseed,/obj/item/seeds/sugarcaneseed,/obj/item/seeds/wheatseed,/obj/item/seeds/watermelonseed,/obj/structure/table,/obj/item/seeds/towermycelium,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) +"aLg" = (/obj/item/seeds/apple,/obj/item/seeds/banana,/obj/item/seeds/cocoapod,/obj/item/seeds/grape,/obj/item/seeds/orange,/obj/item/seeds/sugarcane,/obj/item/seeds/wheat,/obj/item/seeds/watermelon,/obj/structure/table,/obj/item/seeds/tower,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) "aLh" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/grass,/area/hallway/secondary/construction{name = "\improper Garden"}) "aLi" = (/mob/living/simple_animal/chicken{name = "Featherbottom"; real_name = "Featherbottom"},/turf/simulated/floor/grass,/area/hallway/secondary/construction{name = "\improper Garden"}) "aLj" = (/obj/effect/decal/cleanable/cobweb,/obj/structure/closet/crate{icon_state = "crateopen"; opened = 1},/obj/item/weapon/wirecutters,/obj/item/weapon/weldingtool,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/starboard) @@ -5429,7 +5429,7 @@ "cau" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hydroponics) "cav" = (/turf/simulated/floor/plasteel,/area/hydroponics) "caw" = (/obj/effect/landmark/start{name = "Botanist"},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/hydroponics) -"cax" = (/obj/item/seeds/wheatseed,/obj/item/seeds/sugarcaneseed,/obj/item/seeds/potatoseed,/obj/item/seeds/appleseed,/obj/item/weapon/grown/corncob,/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,/obj/item/weapon/reagent_containers/food/snacks/grown/wheat,/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin{pixel_y = 5},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/machinery/camera/autoname{dir = 8; network = list("SS13")},/obj/structure/table/glass,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/hydroponics) +"cax" = (/obj/item/seeds/wheat,/obj/item/seeds/sugarcane,/obj/item/seeds/potato,/obj/item/seeds/apple,/obj/item/weapon/grown/corncob,/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,/obj/item/weapon/reagent_containers/food/snacks/grown/wheat,/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin{pixel_y = 5},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/machinery/camera/autoname{dir = 8; network = list("SS13")},/obj/structure/table/glass,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/hydroponics) "cay" = (/obj/structure/closet/secure_closet/hydroponics,/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) "caz" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/airalarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/landmark/start{name = "Botanist"},/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) "caA" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/junction{icon_state = "pipe-j2"; dir = 2},/turf/simulated/floor/plating,/area/maintenance/starboard) @@ -7559,9 +7559,9 @@ "cPs" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/device/flashlight,/obj/effect/spawner/lootdrop/maintenance,/obj/machinery/light/small,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cPt" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitebluecorner"},/area/medical/medbay3{name = "Medbay Aft"}) "cPu" = (/obj/machinery/biogenerator,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) -"cPv" = (/obj/item/weapon/reagent_containers/food/snacks/grown/banana,/obj/item/weapon/reagent_containers/food/snacks/grown/banana,/obj/item/weapon/reagent_containers/food/snacks/grown/wheat,/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon,/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon,/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon,/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange,/obj/item/weapon/reagent_containers/food/snacks/grown/grapes,/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod,/obj/structure/rack{layer = 2.8},/obj/item/seeds/wheatseed,/obj/item/seeds/watermelonseed,/obj/item/seeds/watermelonseed,/obj/item/seeds/grapeseed,/obj/item/seeds/glowshroom,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) -"cPw" = (/obj/item/weapon/storage/bag/plants/portaseeder,/obj/item/weapon/storage/bag/plants/portaseeder,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/glass/bucket,/obj/structure/rack{layer = 2.8},/obj/item/seeds/cornseed,/obj/item/seeds/cabbageseed,/obj/item/seeds/ambrosiavulgarisseed,/obj/item/seeds/grassseed,/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) -"cPx" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/carrotseed,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) +"cPv" = (/obj/item/weapon/reagent_containers/food/snacks/grown/banana,/obj/item/weapon/reagent_containers/food/snacks/grown/banana,/obj/item/weapon/reagent_containers/food/snacks/grown/wheat,/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon,/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon,/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon,/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange,/obj/item/weapon/reagent_containers/food/snacks/grown/grapes,/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod,/obj/structure/rack{layer = 2.8},/obj/item/seeds/wheat,/obj/item/seeds/watermelon,/obj/item/seeds/watermelon,/obj/item/seeds/grape,/obj/item/seeds/glowshroom,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) +"cPw" = (/obj/item/weapon/storage/bag/plants/portaseeder,/obj/item/weapon/storage/bag/plants/portaseeder,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/glass/bucket,/obj/structure/rack{layer = 2.8},/obj/item/seeds/corn,/obj/item/seeds/cabbage,/obj/item/seeds/ambrosia,/obj/item/seeds/grass,/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) +"cPx" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/carrot,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) "cPy" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/aft{name = "Aft Maintenance"}) "cPz" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/device/analyzer/plant_analyzer,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) "cPA" = (/obj/machinery/power/solar_control{id = "aftstarboard"; name = "Aft Starboard Solar Control"; track = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable,/turf/simulated/floor/plating,/area/maintenance/starboardsolar) @@ -7599,7 +7599,7 @@ "cQg" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cQh" = (/obj/structure/chair/stool,/obj/structure/sign/poster{pixel_y = -32},/turf/simulated/floor/plasteel{icon_state = "cafeteria"; dir = 5},/area/medical/medbay3{name = "Medbay Aft"}) "cQi" = (/obj/structure/sink/kitchen{desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; pixel_y = 28},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating{icon_state = "platingdmg3"},/area/maintenance/aft{name = "Aft Maintenance"}) -"cQj" = (/obj/item/seeds/watermelonseed,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) +"cQj" = (/obj/item/seeds/watermelon,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cQk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cQl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/obj/structure/chair,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cQm" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/maintenance/starboardsolar) @@ -7631,9 +7631,9 @@ "cQM" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor/plasteel{icon_state = "red"},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cQN" = (/obj/structure/table,/obj/machinery/newscaster/security_unit{pixel_x = 29; pixel_y = 1},/obj/machinery/camera{c_tag = "Departure Lounge - Security Post"; dir = 1; network = list("SS13")},/obj/item/weapon/book/manual/wiki/security_space_law{pixel_x = -4; pixel_y = 4},/obj/item/device/taperecorder{pixel_x = 4; pixel_y = 0},/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = -32},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/hallway/secondary/exit{name = "\improper Departure Lounge"}) "cQO" = (/obj/structure/rack,/obj/item/clothing/mask/gas,/obj/item/clothing/glasses/sunglasses,/obj/effect/spawner/lootdrop/maintenance,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) -"cQP" = (/obj/item/seeds/moonflowerseed,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) +"cQP" = (/obj/item/seeds/sunflower/moonflower,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cQQ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) -"cQR" = (/obj/item/seeds/berryseed,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) +"cQR" = (/obj/item/seeds/berry,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cQS" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cQT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/maintenance/starboardsolar) "cQU" = (/obj/machinery/airalarm{dir = 1; pixel_y = -22},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) @@ -7664,9 +7664,9 @@ "cRt" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cRu" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/glowshroom,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) "cRv" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/weapon/cultivator,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) -"cRw" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/ambrosiavulgarisseed,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) -"cRx" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/watermelonseed,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) -"cRy" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/berryseed,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) +"cRw" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/ambrosia,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) +"cRx" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/watermelon,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) +"cRy" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/berry,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) "cRz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/chapel/office) "cRA" = (/obj/machinery/door/airlock/centcom{name = "Chapel Office"; opacity = 1; req_access_txt = "27"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/office) "cRB" = (/obj/machinery/airalarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/chapel/main) @@ -7769,7 +7769,7 @@ "cTu" = (/obj/structure/sign/biohazard,/turf/simulated/wall,/area/toxins/xenobiology) "cTv" = (/obj/structure/sign/securearea,/turf/simulated/wall,/area/toxins/xenobiology) "cTw" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research{name = "Xenobiology Lab"; req_access_txt = "47"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitepurplefull"},/area/toxins/xenobiology) -"cTx" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/glowshroom,/obj/item/seeds/cornseed,/obj/structure/sign/poster{pixel_y = 32},/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) +"cTx" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/glowshroom,/obj/item/seeds/corn,/obj/structure/sign/poster{pixel_y = 32},/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) "cTy" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/toxins/xenobiology) "cTz" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitepurple"},/area/toxins/xenobiology) "cTA" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 545eee9d81e..c0868b7ccf3 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -91,7 +91,7 @@ /area/security/prison) "aan" = ( /obj/machinery/hydroponics/soil, -/obj/item/seeds/ambrosiavulgarisseed, +/obj/item/seeds/ambrosia, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "green" @@ -105,7 +105,7 @@ /area/security/prison) "aap" = ( /obj/machinery/hydroponics/soil, -/obj/item/seeds/carrotseed, +/obj/item/seeds/carrot, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "green" @@ -191,7 +191,7 @@ "aaB" = ( /obj/structure/window/reinforced, /obj/machinery/hydroponics/soil, -/obj/item/seeds/potatoseed, +/obj/item/seeds/potato, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "green" @@ -204,7 +204,7 @@ "aaD" = ( /obj/structure/window/reinforced, /obj/machinery/hydroponics/soil, -/obj/item/seeds/grassseed, +/obj/item/seeds/grass, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "green" @@ -13499,16 +13499,16 @@ name = "\improper Garden" }) "aBw" = ( -/obj/item/seeds/appleseed, -/obj/item/seeds/bananaseed, -/obj/item/seeds/cocoapodseed, -/obj/item/seeds/grapeseed, -/obj/item/seeds/orangeseed, -/obj/item/seeds/sugarcaneseed, -/obj/item/seeds/wheatseed, -/obj/item/seeds/watermelonseed, +/obj/item/seeds/apple, +/obj/item/seeds/banana, +/obj/item/seeds/cocoapod, +/obj/item/seeds/grape, +/obj/item/seeds/orange, +/obj/item/seeds/sugarcane, +/obj/item/seeds/wheat, +/obj/item/seeds/watermelon, /obj/structure/table/glass, -/obj/item/seeds/towermycelium, +/obj/item/seeds/tower, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, diff --git a/_maps/map_files/generic/z5.dmm b/_maps/map_files/generic/z5.dmm index 390c7889ada..065dade258b 100644 --- a/_maps/map_files/generic/z5.dmm +++ b/_maps/map_files/generic/z5.dmm @@ -88,7 +88,7 @@ "bJ" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/mine/abandoned) "bK" = (/obj/structure/sink{pixel_y = 30},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/mine/abandoned) "bL" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/mine/abandoned) -"bM" = (/obj/structure/table,/obj/item/weapon/paper/crumpled,/obj/item/seeds/cherryseed,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/mine/abandoned) +"bM" = (/obj/structure/table,/obj/item/weapon/paper/crumpled,/obj/item/seeds/cherry,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/mine/abandoned) "bN" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/plating/asteroid/airless,/area/mine/north_outpost) "bO" = (/obj/machinery/light/small{dir = 4},/obj/structure/barricade/wooden,/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/mine/production) "bP" = (/obj/item/clothing/mask/facehugger{icon_state = "facehugger_dead"; stat = 2},/obj/structure/alien/weeds,/turf/simulated/floor/plasteel/airless,/area/mine/abandoned) diff --git a/_maps/map_files/generic/z6.dmm b/_maps/map_files/generic/z6.dmm index c4543a0b717..22673362db8 100644 --- a/_maps/map_files/generic/z6.dmm +++ b/_maps/map_files/generic/z6.dmm @@ -190,7 +190,7 @@ "dH" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/carpet,/area/awaymission/BMPship/Fore) "dI" = (/obj/machinery/hydroponics,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 10},/area/awaymission/BMPship/Midship) "dJ" = (/turf/simulated/floor/plasteel{icon_state = "green"},/area/awaymission/BMPship/Midship) -"dK" = (/obj/machinery/seed_extractor,/obj/item/seeds/walkingmushroommycelium,/turf/simulated/floor/plasteel{icon_state = "green"},/area/awaymission/BMPship/Midship) +"dK" = (/obj/machinery/seed_extractor,/obj/item/seeds/plump/walkingmushroom,/turf/simulated/floor/plasteel{icon_state = "green"},/area/awaymission/BMPship/Midship) "dL" = (/obj/machinery/hydroponics,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 6},/area/awaymission/BMPship/Midship) "dM" = (/turf/simulated/wall/shuttle{icon_state = "swall2"},/area/awaymission/BMPship/Midship) "dN" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/awaymission/BMPship/Midship) diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm index 5e405252680..06bdcfe28f5 100644 --- a/code/game/asteroid.dm +++ b/code/game/asteroid.dm @@ -125,8 +125,8 @@ var/global/max_secret_rooms = 6 if("plantlab") theme = "plantlab" - treasureitems = list(/obj/item/weapon/gun/energy/floragun=1,/obj/item/seeds/novaflowerseed=2,/obj/item/seeds/bluespacetomatoseed=2,/obj/item/seeds/bluetomatoseed=2, - /obj/item/seeds/coffee_robusta_seed=2, /obj/item/seeds/cashseed=2) + treasureitems = list(/obj/item/weapon/gun/energy/floragun=1,/obj/item/seeds/sunflower/novaflower=2,/obj/item/seeds/tomato/blue/bluespace=2,/obj/item/seeds/tomato/blue=2, + /obj/item/seeds/coffee/robusta=2, /obj/item/seeds/cash=2) fluffitems = list(/obj/structure/flora/kirbyplants=1,/obj/structure/table/reinforced=2,/obj/machinery/hydroponics/constructable=1, /obj/effect/glowshroom/single=2,/obj/item/weapon/reagent_containers/syringe/charcoal=2, /obj/item/weapon/reagent_containers/glass/bottle/diethylamine=3,/obj/item/weapon/reagent_containers/glass/bottle/ammonia=3) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 2a278e61262..7178c27abe1 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -798,16 +798,16 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!" product_ads = "We like plants!;Grow some crops!;Grow, baby, growww!;Aw h'yeah son!" icon_state = "seeds" - products = list(/obj/item/seeds/ambrosiavulgarisseed = 3,/obj/item/seeds/appleseed = 3,/obj/item/seeds/bananaseed = 3,/obj/item/seeds/berryseed = 3, - /obj/item/seeds/cabbageseed = 3,/obj/item/seeds/carrotseed = 3,/obj/item/seeds/cherryseed = 3,/obj/item/seeds/chantermycelium = 3, - /obj/item/seeds/chiliseed = 3,/obj/item/seeds/cocoapodseed = 3,/obj/item/seeds/coffee_arabica_seed = 3,/obj/item/seeds/cornseed = 3, - /obj/item/seeds/eggplantseed = 3,/obj/item/seeds/grapeseed = 3,/obj/item/seeds/grassseed = 3,/obj/item/seeds/lemonseed = 3, - /obj/item/seeds/limeseed = 3,/obj/item/seeds/orangeseed = 3,/obj/item/seeds/potatoseed = 3,/obj/item/seeds/poppyseed = 3, - /obj/item/seeds/pumpkinseed = 3,/obj/item/seeds/replicapod = 3,/obj/item/seeds/riceseed = 3,/obj/item/seeds/soyaseed = 3,/obj/item/seeds/sunflowerseed = 3, - /obj/item/seeds/tea_aspera_seed = 3,/obj/item/seeds/tobacco_seed = 3,/obj/item/seeds/tomatoseed = 3, - /obj/item/seeds/towermycelium = 3,/obj/item/seeds/watermelonseed = 3,/obj/item/seeds/wheatseed = 3,/obj/item/seeds/whitebeetseed = 3) - contraband = list(/obj/item/seeds/amanitamycelium = 2,/obj/item/seeds/glowshroom = 2,/obj/item/seeds/libertymycelium = 2,/obj/item/seeds/nettleseed = 2, - /obj/item/seeds/plumpmycelium = 2,/obj/item/seeds/reishimycelium = 2) + products = list(/obj/item/seeds/ambrosia = 3,/obj/item/seeds/apple = 3,/obj/item/seeds/banana = 3,/obj/item/seeds/berry = 3, + /obj/item/seeds/cabbage = 3,/obj/item/seeds/carrot = 3,/obj/item/seeds/cherry = 3,/obj/item/seeds/chanter = 3, + /obj/item/seeds/chili = 3,/obj/item/seeds/cocoapod = 3,/obj/item/seeds/coffee = 3,/obj/item/seeds/corn = 3, + /obj/item/seeds/eggplant = 3,/obj/item/seeds/grape = 3,/obj/item/seeds/grass = 3,/obj/item/seeds/lemon = 3, + /obj/item/seeds/lime = 3,/obj/item/seeds/orange = 3,/obj/item/seeds/potato = 3,/obj/item/seeds/poppy = 3, + /obj/item/seeds/pumpkin = 3,/obj/item/seeds/replicapod = 3,/obj/item/seeds/wheat/rice = 3,/obj/item/seeds/soya = 3,/obj/item/seeds/sunflower = 3, + /obj/item/seeds/tea = 3,/obj/item/seeds/tobacco = 3,/obj/item/seeds/tomato = 3, + /obj/item/seeds/tower = 3,/obj/item/seeds/watermelon = 3,/obj/item/seeds/wheat = 3,/obj/item/seeds/whitebeet = 3) + contraband = list(/obj/item/seeds/amanita = 2,/obj/item/seeds/glowshroom = 2,/obj/item/seeds/liberty = 2,/obj/item/seeds/nettle = 2, + /obj/item/seeds/plump = 2,/obj/item/seeds/reishi = 2) premium = list(/obj/item/weapon/reagent_containers/spray/waterflower = 1) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 06e2e7fc1a1..983e8f0a068 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -889,34 +889,34 @@ /datum/supply_pack/organic/hydroponics/seeds name = "Seeds Crate" cost = 10 - contains = list(/obj/item/seeds/chiliseed, - /obj/item/seeds/berryseed, - /obj/item/seeds/cornseed, - /obj/item/seeds/eggplantseed, - /obj/item/seeds/tomatoseed, - /obj/item/seeds/soyaseed, - /obj/item/seeds/wheatseed, - /obj/item/seeds/riceseed, - /obj/item/seeds/carrotseed, - /obj/item/seeds/sunflowerseed, - /obj/item/seeds/chantermycelium, - /obj/item/seeds/potatoseed, - /obj/item/seeds/sugarcaneseed) + contains = list(/obj/item/seeds/chili, + /obj/item/seeds/berry, + /obj/item/seeds/corn, + /obj/item/seeds/eggplant, + /obj/item/seeds/tomato, + /obj/item/seeds/soya, + /obj/item/seeds/wheat, + /obj/item/seeds/wheat/rice, + /obj/item/seeds/carrot, + /obj/item/seeds/sunflower, + /obj/item/seeds/chanter, + /obj/item/seeds/potato, + /obj/item/seeds/sugarcane) crate_name = "seeds crate" /datum/supply_pack/organic/hydroponics/exoticseeds name = "Exotic Seeds Crate" cost = 15 - contains = list(/obj/item/seeds/nettleseed, + contains = list(/obj/item/seeds/nettle, /obj/item/seeds/replicapod, /obj/item/seeds/replicapod, /obj/item/seeds/replicapod, - /obj/item/seeds/plumpmycelium, - /obj/item/seeds/libertymycelium, - /obj/item/seeds/amanitamycelium, - /obj/item/seeds/reishimycelium, - /obj/item/seeds/bananaseed, - /obj/item/seeds/eggyseed) + /obj/item/seeds/plump, + /obj/item/seeds/liberty, + /obj/item/seeds/amanita, + /obj/item/seeds/reishi, + /obj/item/seeds/banana, + /obj/item/seeds/eggplant/eggy) crate_name = "exotic seeds crate" /datum/supply_pack/organic/vending @@ -1231,7 +1231,7 @@ contains = list(/obj/item/weapon/poster/contraband, /obj/item/weapon/storage/fancy/cigarettes/cigpack_shadyjims, /obj/item/weapon/storage/fancy/cigarettes/cigpack_midori, - /obj/item/seeds/ambrosiadeusseed, + /obj/item/seeds/ambrosia/deus, /obj/item/clothing/tie/dope_necklace) crate_name = "crate" diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 1f661c8bdba..3cf08af5aa8 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -357,7 +357,7 @@ master.vines -= src master.growth_queue -= src if(!master.vines.len) - var/obj/item/seeds/kudzuseed/KZ = new(loc) + var/obj/item/seeds/kudzu/KZ = new(loc) KZ.mutations |= mutations KZ.potency = min(100, master.mutativness * 10) KZ.production = (master.spread_cap / initial(master.spread_cap)) * 50 diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm index 936bfc30144..2da19136d3c 100644 --- a/code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm @@ -197,7 +197,7 @@ time = 15 name = "Poppy pretzel" reqs = list( - /obj/item/seeds/poppyseed = 1, + /obj/item/seeds/poppy = 1, /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index b5606b7b0bf..a55a1ef0116 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -55,6 +55,9 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/proc/add_juice() if(reagents) for(var/reagent_id in reagents_add) + if(reagent_id == "blood") // Hack to make blood in plants always O- + reagents.add_reagent(reagent_id, 1 + round(potency * reagents_add[reagent_id]), list("blood_type"="O-")) + continue reagents.add_reagent(reagent_id, 1 + round(potency * reagents_add[reagent_id])) if(bitesize_mod) bitesize = 1 + round(reagents.total_volume / bitesize_mod) @@ -73,6 +76,8 @@ msg += "- Plant type: Weed. Can grow in nutrient-poor soil.\n" if(2) msg += "- Plant type: Mushroom. Can grow in dry soil.\n" + else + msg += "- Plant type: UNKNOWN. \n" msg += "- Potency: [potency]\n" msg += "- Yield: [yield]\n" msg += "- Maturation speed: [maturation]\n" @@ -85,7 +90,7 @@ var/list/scannable_reagents = list("charcoal" = "Anti-Toxin", "morphine" = "Morphine", "amatoxin" = "Amatoxins", "toxin" = "Toxins", "mushroomhallucinogen" = "Mushroom Hallucinogen", "condensedcapsaicin" = "Condensed Capsaicin", "capsaicin" = "Capsaicin", "frostoil" = "Frost Oil", "gold" = "Mineral Content", - "radium" = "Radioactive Material", "uranium" = "Radioactive Material") + "radium" = "Highly Radioactive Material", "uranium" = "Radioactive Material") var/reag_txt = "" for(var/reagent_id in scannable_reagents) if(reagent_id in reagents_add) @@ -97,4 +102,11 @@ user << reag_txt user << "*---------*" return - return \ No newline at end of file + return + + +/obj/item/weapon/reagent_containers/food/snacks/grown/shell/attack_self(mob/user as mob) + if(trash) + new trash(user.loc) + user.unEquip(src) + qdel(src) \ No newline at end of file diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm index 0264ce94fa3..7d94f6cf3cc 100644 --- a/code/modules/hydroponics/grown/ambrosia.dm +++ b/code/modules/hydroponics/grown/ambrosia.dm @@ -1,4 +1,5 @@ -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia //abstract type +// Ambrosia - base type +/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia name = "ambrosia branch" desc = "This is a plant." icon_state = "ambrosiavulgaris" @@ -8,14 +9,39 @@ // It means 1 nutriment no matter how low or high potency is bitesize_mod = 2 +// Ambrosia Vulgaris +/obj/item/seeds/ambrosia + name = "pack of ambrosia vulgaris seeds" + desc = "These seeds grow into common ambrosia, a plant grown by and from medicine." + icon_state = "seed-ambrosiavulgaris" + species = "ambrosiavulgaris" + plantname = "Ambrosia Vulgaris" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris + lifespan = 60 + endurance = 25 + yield = 6 + potency = 5 + mutatelist = list(/obj/item/seeds/ambrosia/deus) + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris - seed = /obj/item/seeds/ambrosiavulgarisseed + seed = /obj/item/seeds/ambrosia name = "ambrosia vulgaris branch" desc = "This is a plant containing various healing chemicals." reagents_add = list("space_drugs" = 0.15, "salglu_solution" = 0.25, "vitamin" = 0.04, "nutriment" = 0, "toxin" = 0.1) +// Ambrosia Deus +/obj/item/seeds/ambrosia/deus + name = "pack of ambrosia deus seeds" + desc = "These seeds grow into ambrosia deus. Could it be the food of the gods..?" + icon_state = "seed-ambrosiadeus" + species = "ambrosiadeus" + plantname = "Ambrosia Deus" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus + mutatelist = list() + rarity = 40 + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus - seed = /obj/item/seeds/ambrosiadeusseed + seed = /obj/item/seeds/ambrosia/deus name = "ambrosia deus branch" desc = "Eating this makes you feel immortal!" icon_state = "ambrosiadeus" diff --git a/code/modules/hydroponics/grown/apple.dm b/code/modules/hydroponics/grown/apple.dm index c7b9c646373..27386796006 100644 --- a/code/modules/hydroponics/grown/apple.dm +++ b/code/modules/hydroponics/grown/apple.dm @@ -1,6 +1,18 @@ // Apple +/obj/item/seeds/apple + name = "pack of apple seeds" + desc = "These seeds grow into apple trees." + icon_state = "seed-apple" + species = "apple" + plantname = "Apple Tree" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/apple + lifespan = 55 + endurance = 35 + yield = 5 + mutatelist = list(/obj/item/seeds/apple/gold) + /obj/item/weapon/reagent_containers/food/snacks/grown/apple - seed = /obj/item/seeds/appleseed + seed = /obj/item/seeds/apple name = "apple" desc = "It's a little piece of Eden." icon_state = "apple" @@ -8,16 +20,31 @@ reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1) bitesize = 100 // Always eat the apple in one bite - // Posioned Apple +/obj/item/seeds/apple/poisoned + product = /obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned + mutatelist = list() + rarity = 50 // Source of cyanide, and hard (almost impossible) to obtain normally. + /obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned - seed = /obj/item/seeds/poisonedappleseed + seed = /obj/item/seeds/apple/poisoned reagents_add = list("cyanide" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1) - // Gold Apple +/obj/item/seeds/apple/gold + name = "pack of golden apple seeds" + desc = "These seeds grow into golden apple trees. Good thing there are no firebirds in space." + icon_state = "seed-goldapple" + species = "goldapple" + plantname = "Golden Apple Tree" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold + maturation = 10 + production = 10 + mutatelist = list() + rarity = 40 // Alchemy! + /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold - seed = /obj/item/seeds/goldappleseed + seed = /obj/item/seeds/apple/gold name = "golden apple" desc = "Emblazoned upon the apple is the word 'Kallisti'." icon_state = "goldapple" diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index 1d8db934b97..dca7b0f5de9 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -1,6 +1,17 @@ // Banana +/obj/item/seeds/banana + name = "pack of banana seeds" + desc = "They're seeds that grow into banana trees. When grown, keep away from clown." + icon_state = "seed-banana" + species = "banana" + plantname = "Banana Tree" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/banana + lifespan = 50 + endurance = 30 + mutatelist = list(/obj/item/seeds/banana/mime, /obj/item/seeds/banana/bluespace) + /obj/item/weapon/reagent_containers/food/snacks/grown/banana - seed = /obj/item/seeds/bananaseed + seed = /obj/item/seeds/banana name = "banana" desc = "It's an excellent prop for a clown." icon = 'icons/obj/items.dmi' @@ -15,15 +26,29 @@ user.visible_message("[user] is aiming the [src.name] at themself! It looks like \he's trying to commit suicide.") playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1) sleep(25) + if(!user) + return (OXYLOSS) user.say("BANG!") sleep(25) + if(!user) + return (OXYLOSS) user.visible_message("[user] laughs so hard they begin to suffocate!") return (OXYLOSS) // Mimana +/obj/item/seeds/banana/mime + name = "pack of mimana seeds" + desc = "They're seeds that grow into mimana trees. When grown, keep away from mime." + icon_state = "seed-mimana" + species = "mimana" + plantname = "Mimana Tree" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/banana/mime + mutatelist = list() + rarity = 15 + /obj/item/weapon/reagent_containers/food/snacks/grown/banana/mime - seed = /obj/item/seeds/mimanaseed + seed = /obj/item/seeds/banana/mime name = "mimana" desc = "It's an excellent prop for a mime." icon_state = "mimana" @@ -33,11 +58,80 @@ // Bluespace Banana +/obj/item/seeds/banana/bluespace + name = "pack of bluespace banana seeds" + desc = "They're seeds that grow into bluespace banana trees. When grown, keep away from bluespace clown." + icon_state = "seed-banana-blue" + species = "bluespacebanana" + plantname = "Bluespace Banana Tree" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/banana/bluespace + mutatelist = list() + rarity = 30 + /obj/item/weapon/reagent_containers/food/snacks/grown/banana/bluespace - seed = /obj/item/seeds/bluespacebananaseed + seed = /obj/item/seeds/banana/bluespace name = "bluespace banana" icon_state = "banana_blue" trash = /obj/item/weapon/grown/bananapeel/bluespace filling_color = "#0000FF" origin_tech = "bluespace=3" - reagents_add = list("singulo" = 0.2, "banana" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02) \ No newline at end of file + reagents_add = list("singulo" = 0.2, "banana" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02) + + + + +// Banana Peels +/obj/item/weapon/grown/bananapeel + name = "banana peel" + desc = "A peel from a banana." + icon = 'icons/obj/items.dmi' + icon_state = "banana_peel" + item_state = "banana_peel" + w_class = 1 + throwforce = 0 + throw_speed = 3 + throw_range = 7 + +/obj/item/weapon/grown/bananapeel/suicide_act(mob/user) + user.visible_message("[user] is deliberately slipping on the [src.name]! It looks like \he's trying to commit suicide.") + playsound(loc, 'sound/misc/slip.ogg', 50, 1, -1) + return (BRUTELOSS) + +/obj/item/weapon/grown/bananapeel/Crossed(AM as mob|obj) + if (istype(AM, /mob/living/carbon)) + var/mob/living/carbon/M = AM + var/stun = Clamp(potency / 10, 1, 10) + var/weaken = Clamp(potency / 20, 0.5, 5) + M.slip(stun, weaken, src) + return 1 + +/obj/item/weapon/grown/bananapeel/bluespace + name = "bluespace banana peel" + desc = "A peel from a bluespace banana." + icon = 'icons/obj/hydroponics/harvest.dmi' + icon_state = "banana_peel_blue" + origin_tech = "bluespace=3" + +/obj/item/weapon/grown/bananapeel/bluespace/Crossed(AM) + if(..()) + var/teleport_radius = potency / 10 + do_teleport(AM, get_turf(AM), teleport_radius) + AM << "You slip through spacetime!" + if(prob(50)) + do_teleport(src, get_turf(src), teleport_radius) + else + qdel(src) + +/obj/item/weapon/grown/bananapeel/specialpeel //used by /obj/item/clothing/shoes/clown_shoes/banana_shoes + name = "synthesized banana peel" + desc = "A synthetic banana peel." + +/obj/item/weapon/grown/bananapeel/specialpeel/Crossed(AM) + if(..()) + qdel(src) + +/obj/item/weapon/grown/bananapeel/mimanapeel + name = "mimana peel" + desc = "A mimana peel." + icon = 'icons/obj/hydroponics/harvest.dmi' + icon_state = "mimana_peel" \ No newline at end of file diff --git a/code/modules/hydroponics/grown/beans.dm b/code/modules/hydroponics/grown/beans.dm index 936b1ca1696..298f5ac86cf 100644 --- a/code/modules/hydroponics/grown/beans.dm +++ b/code/modules/hydroponics/grown/beans.dm @@ -1,5 +1,19 @@ +// Soybeans +/obj/item/seeds/soya + name = "pack of soybean seeds" + desc = "These seeds grow into soybean plants." + icon_state = "seed-soybean" + species = "soybean" + plantname = "Soybean Plants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans + maturation = 4 + production = 4 + potency = 15 + growthstages = 4 + mutatelist = list(/obj/item/seeds/soya/koi) + /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans - seed = /obj/item/seeds/soyaseed + seed = /obj/item/seeds/soya name = "soybeans" desc = "It's pretty bland, but oh the possibilities..." gender = PLURAL @@ -8,8 +22,20 @@ reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05) bitesize_mod = 2 +// Koibean +/obj/item/seeds/soya/koi + name = "pack of koibean seeds" + desc = "These seeds grow into koibean plants." + icon_state = "seed-koibean" + species = "soybean" + plantname = "Koibean Plants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/koibeans + mutatelist = list() + potency = 10 + rarity = 20 + /obj/item/weapon/reagent_containers/food/snacks/grown/koibeans - seed = /obj/item/seeds/koiseed + seed = /obj/item/seeds/soya/koi name = "koibean" desc = "Something about these seems fishy." icon_state = "koibeans" diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index b1dc16d34ef..4628e52e3e6 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -1,6 +1,19 @@ // Berries +/obj/item/seeds/berry + name = "pack of berry seeds" + desc = "These seeds grow into berry bushes." + icon_state = "seed-berry" + species = "berry" + plantname = "Berry Bush" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/berries + lifespan = 20 + maturation = 5 + production = 5 + yield = 2 + mutatelist = list(/obj/item/seeds/berry/glow, /obj/item/seeds/berry/poison) + /obj/item/weapon/reagent_containers/food/snacks/grown/berries - seed = /obj/item/seeds/berryseed + seed = /obj/item/seeds/berry name = "bunch of berries" desc = "Nutritious!" icon_state = "berrypile" @@ -9,30 +22,61 @@ reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1) bitesize_mod = 2 - // Poison Berries +/obj/item/seeds/berry/poison + name = "pack of poison-berry seeds" + desc = "These seeds grow into poison-berry bushes." + icon_state = "seed-poisonberry" + species = "poisonberry" + plantname = "Poison-Berry Bush" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/berries/poison + mutatelist = list(/obj/item/seeds/berry/death) + rarity = 10 // Mildly poisonous berries are common in reality + /obj/item/weapon/reagent_containers/food/snacks/grown/berries/poison - seed = /obj/item/seeds/poisonberryseed + seed = /obj/item/seeds/berry/poison name = "bunch of poison-berries" desc = "Taste so good, you could die!" icon_state = "poisonberrypile" filling_color = "#C71585" reagents_add = list("toxin" = 0.25, "vitamin" = 0.04, "nutriment" = 0.1) - // Death Berries +/obj/item/seeds/berry/death + name = "pack of death-berry seeds" + desc = "These seeds grow into death berries." + icon_state = "seed-deathberry" + species = "deathberry" + plantname = "Death Berry Bush" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/berries/death + lifespan = 30 + potency = 50 + mutatelist = list() + rarity = 30 + /obj/item/weapon/reagent_containers/food/snacks/grown/berries/death - seed = /obj/item/seeds/deathberryseed + seed = /obj/item/seeds/berry/death name = "bunch of death-berries" desc = "Taste so good, you could die!" icon_state = "deathberrypile" filling_color = "#708090" reagents_add = list("lexorin" = 0.25, "toxin" = 0.35, "vitamin" = 0.04, "nutriment" = 0.1) - // Glow Berries +/obj/item/seeds/berry/glow + name = "pack of glow-berry seeds" + desc = "These seeds grow into glow-berry bushes." + icon_state = "seed-glowberry" + species = "glowberry" + plantname = "Glow-Berry Bush" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow + lifespan = 30 + endurance = 25 + mutatelist = list() + rarity = 20 + /obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow - seed = /obj/item/seeds/glowberryseed + seed = /obj/item/seeds/berry/glow name = "bunch of glow-berries" desc = "Nutritious!" var/on = 1 @@ -58,8 +102,22 @@ // Cherries +/obj/item/seeds/cherry + name = "pack of cherry pits" + desc = "Careful not to crack a tooth on one... That'd be the pits." + icon_state = "seed-cherry" + species = "cherry" + plantname = "Cherry Tree" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/cherries + lifespan = 35 + endurance = 35 + maturation = 5 + production = 5 + growthstages = 5 + mutatelist = list(/obj/item/seeds/cherry/blue) + /obj/item/weapon/reagent_containers/food/snacks/grown/cherries - seed = /obj/item/seeds/cherryseed + seed = /obj/item/seeds/cherry name = "cherries" desc = "Great for toppings!" icon_state = "cherry" @@ -68,8 +126,19 @@ reagents_add = list("nutriment" = 0.07, "sugar" = 0.07) bitesize_mod = 2 +// Blue Cherries +/obj/item/seeds/cherry/blue + name = "pack of blue cherry pits" + desc = "The blue kind of cherries" + icon_state = "seed-bluecherry" + species = "bluecherry" + plantname = "Blue Cherry Tree" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries + mutatelist = list() + rarity = 10 + /obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries - seed = /obj/item/seeds/bluecherryseed + seed = /obj/item/seeds/cherry/blue name = "blue cherries" desc = "They're cherries that are blue." icon_state = "bluecherry" @@ -79,8 +148,23 @@ // Grapes +/obj/item/seeds/grape + name = "pack of grape seeds" + desc = "These seeds grow into grape vines." + icon_state = "seed-grapes" + species = "grape" + plantname = "Grape Vine" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/grapes + lifespan = 50 + endurance = 25 + maturation = 3 + production = 5 + yield = 4 + growthstages = 2 + mutatelist = list(/obj/item/seeds/grape/green) + /obj/item/weapon/reagent_containers/food/snacks/grown/grapes - seed = /obj/item/seeds/grapeseed + seed = /obj/item/seeds/grape name = "bunch of grapes" desc = "Nutritious!" icon_state = "grapes" @@ -89,8 +173,19 @@ reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1, "sugar" = 0.1) bitesize_mod = 2 +// Green Grapes +/obj/item/seeds/grape/green + name = "pack of green grape seeds" + desc = "These seeds grow into green-grape vines." + icon_state = "seed-greengrapes" + species = "greengrape" + plantname = "Green-Grape Vine" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/grapes/green + // No rarity: technically it's a beneficial mutant, but it's not exactly "new"... + mutatelist = list() + /obj/item/weapon/reagent_containers/food/snacks/grown/grapes/green - seed = /obj/item/seeds/greengrapeseed + seed = /obj/item/seeds/grape/green name = "bunch of green grapes" icon_state = "greengrapes" filling_color = "#7FFF00" diff --git a/code/modules/hydroponics/grown/cereals.dm b/code/modules/hydroponics/grown/cereals.dm index 8d328ff394d..8835d45d1ac 100644 --- a/code/modules/hydroponics/grown/cereals.dm +++ b/code/modules/hydroponics/grown/cereals.dm @@ -1,5 +1,19 @@ +// Wheat +/obj/item/seeds/wheat + name = "pack of wheat seeds" + desc = "These may, or may not, grow into wheat." + icon_state = "seed-wheat" + species = "wheat" + plantname = "Wheat Stalks" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/wheat + production = 1 + yield = 4 + potency = 15 + oneharvest = 1 + mutatelist = list(/obj/item/seeds/wheat/oat) + /obj/item/weapon/reagent_containers/food/snacks/grown/wheat - seed = /obj/item/seeds/wheatseed + seed = /obj/item/seeds/wheat name = "wheat" desc = "Sigh... wheat... a-grain?" gender = PLURAL @@ -8,9 +22,18 @@ bitesize_mod = 2 reagents_add = list("nutriment" = 0.04) +// Oat +/obj/item/seeds/wheat/oat + name = "pack of oat seeds" + desc = "These may, or may not, grow into oat." + icon_state = "seed-oat" + species = "oat" + plantname = "Oat Stalks" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/oat + mutatelist = list() /obj/item/weapon/reagent_containers/food/snacks/grown/oat - seed = /obj/item/seeds/oatseed + seed = /obj/item/seeds/wheat/oat name = "oat" desc = "Eat oats, do squats." gender = PLURAL @@ -19,9 +42,19 @@ bitesize_mod = 2 reagents_add = list("nutriment" = 0.04) +// Rice +/obj/item/seeds/wheat/rice + name = "pack of rice seeds" + desc = "These may, or may not, grow into rice." + icon_state = "seed-rice" + species = "rice" + plantname = "Rice Stalks" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/rice + mutatelist = list() + growthstages = 3 /obj/item/weapon/reagent_containers/food/snacks/grown/rice - seed = /obj/item/seeds/riceseed + seed = /obj/item/seeds/wheat/rice name = "rice" desc = "Rice to meet you." gender = PLURAL diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index 85182c9a2d6..6bd2ecc76f6 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -1,6 +1,20 @@ // Chili +/obj/item/seeds/chili + name = "pack of chili seeds" + desc = "These seeds grow into chili plants. HOT! HOT! HOT!" + icon_state = "seed-chili" + species = "chili" + plantname = "Chili Plants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/chili + lifespan = 20 + maturation = 5 + production = 5 + yield = 4 + potency = 20 + mutatelist = list(/obj/item/seeds/chili/ice, /obj/item/seeds/chili/ghost) + /obj/item/weapon/reagent_containers/food/snacks/grown/chili - seed = /obj/item/seeds/chiliseed + seed = /obj/item/seeds/chili name = "chili" desc = "It's spicy! Wait... IT'S BURNING ME!!" icon_state = "chilipepper" @@ -8,10 +22,22 @@ reagents_add = list("capsaicin" = 0.25, "vitamin" = 0.04, "nutriment" = 0.04) bitesize_mod = 2 - // Ice Chili +/obj/item/seeds/chili/ice + name = "pack of ice pepper seeds" + desc = "These seeds grow into ice pepper plants." + icon_state = "seed-icepepper" + species = "chiliice" + plantname = "Ice Pepper Plants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper + lifespan = 25 + maturation = 4 + production = 4 + rarity = 20 + mutatelist = list() + /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper - seed = /obj/item/seeds/icepepperseed + seed = /obj/item/seeds/chili/ice name = "ice pepper" desc = "It's a mutant strain of chili" icon_state = "icepepper" @@ -19,10 +45,23 @@ reagents_add = list("frostoil" = 0.25, "vitamin" = 0.02, "nutriment" = 0.02) bitesize_mod = 2 - // Ghost Chili +/obj/item/seeds/chili/ghost + name = "pack of ghost chili seeds" + desc = "These seeds grow into a chili said to be the hottest in the galaxy." + icon_state = "seed-chilighost" + species = "chilighost" + plantname = "chilighost" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili + endurance = 10 + maturation = 10 + production = 10 + yield = 3 + rarity = 20 + mutatelist = list() + /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili - seed = /obj/item/seeds/chilighost + seed = /obj/item/seeds/chili/ghost name = "ghost chili" desc = "It seems to be vibrating gently." icon_state = "ghostchilipepper" diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index 2ced7418afe..188bcbc9bb0 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -1,46 +1,92 @@ -/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/ //abstract type - seed = /obj/item/seeds/limeseed +// Citrus - base type +/obj/item/weapon/reagent_containers/food/snacks/grown/citrus + seed = /obj/item/seeds/lime name = "citrus" desc = "It's so sour, your face will twist." icon_state = "lime" reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05) bitesize_mod = 2 - // Lime +/obj/item/seeds/lime + name = "pack of lime seeds" + desc = "These are very sour seeds." + icon_state = "seed-lime" + species = "lime" + plantname = "Lime Tree" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lime + lifespan = 55 + endurance = 50 + yield = 4 + potency = 15 + mutatelist = list(/obj/item/seeds/orange) + /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lime - seed = /obj/item/seeds/limeseed + seed = /obj/item/seeds/lime name = "lime" desc = "It's so sour, your face will twist." icon_state = "lime" filling_color = "#00FF00" - -// Lemon -/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon - seed = /obj/item/seeds/lemonseed - name = "lemon" - desc = "When life gives you lemons, be grateful they aren't limes." - icon_state = "lemon" - filling_color = "#FFD700" - - // Orange +/obj/item/seeds/orange + name = "pack of orange seed" + desc = "Sour seeds." + icon_state = "seed-orange" + species = "orange" + plantname = "Orange Tree" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange + lifespan = 60 + endurance = 50 + yield = 5 + potency = 20 + mutatelist = list(/obj/item/seeds/lime) + /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange - seed = /obj/item/seeds/orangeseed + seed = /obj/item/seeds/orange name = "orange" desc = "It's an tangy fruit." icon_state = "orange" filling_color = "#FFA500" +// Lemon +/obj/item/seeds/lemon + name = "pack of lemon seeds" + desc = "These are sour seeds." + icon_state = "seed-lemon" + species = "lemon" + plantname = "Lemon Tree" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon + lifespan = 55 + endurance = 45 + yield = 4 + mutatelist = list(/obj/item/seeds/cash) + +/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon + seed = /obj/item/seeds/lemon + name = "lemon" + desc = "When life gives you lemons, be grateful they aren't limes." + icon_state = "lemon" + filling_color = "#FFD700" // Money Lemon +/obj/item/seeds/cash + name = "pack of money seeds" + desc = "When life gives you lemons, mutate them into cash." + icon_state = "seed-cash" + species = "cashtree" + plantname = "Money Tree" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/shell/moneyfruit + lifespan = 55 + endurance = 45 + yield = 4 + rarity = 50 // Nanotrasen approves... + /obj/item/weapon/reagent_containers/food/snacks/grown/shell/moneyfruit - seed = /obj/item/seeds/cashseed + seed = /obj/item/seeds/cash name = "Money Fruit" desc = "Looks like a lemon with someone buldging from the inside." icon_state = "moneyfruit" - inside_type = null reagents_add = list("nutriment" = 0.05) bitesize_mod = 2 @@ -48,18 +94,18 @@ ..() switch(potency) if(0 to 10) - inside_type = /obj/item/stack/spacecash + trash = /obj/item/stack/spacecash if(11 to 20) - inside_type = /obj/item/stack/spacecash/c10 + trash = /obj/item/stack/spacecash/c10 if(21 to 30) - inside_type = /obj/item/stack/spacecash/c20 + trash = /obj/item/stack/spacecash/c20 if(31 to 40) - inside_type = /obj/item/stack/spacecash/c50 + trash = /obj/item/stack/spacecash/c50 if(41 to 50) - inside_type = /obj/item/stack/spacecash/c100 + trash = /obj/item/stack/spacecash/c100 if(51 to 60) - inside_type = /obj/item/stack/spacecash/c200 + trash = /obj/item/stack/spacecash/c200 if(61 to 80) - inside_type = /obj/item/stack/spacecash/c500 + trash = /obj/item/stack/spacecash/c500 else - inside_type = /obj/item/stack/spacecash/c1000 \ No newline at end of file + trash = /obj/item/stack/spacecash/c1000 \ No newline at end of file diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm new file mode 100644 index 00000000000..b414540d35c --- /dev/null +++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm @@ -0,0 +1,41 @@ +// Cocoa Pod +/obj/item/seeds/cocoapod + name = "pack of cocoa pod seeds" + desc = "These seeds grow into cacao trees. They look fattening." //SIC: cocoa is the seeds. The trees are spelled cacao. + icon_state = "seed-cocoapod" + species = "cocoapod" + plantname = "Cocao Tree" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod + lifespan = 20 + maturation = 5 + production = 5 + yield = 2 + growthstages = 5 + mutatelist = list(/obj/item/seeds/cocoapod/vanillapod) + +/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod + seed = /obj/item/seeds/cocoapod + name = "cocoa pod" + desc = "Fattening... Mmmmm... chucklate." + icon_state = "cocoapod" + filling_color = "#FFD700" + reagents_add = list("cocoa" = 0.25, "nutriment" = 0.1) + bitesize_mod = 2 + +// Vanilla Pod +/obj/item/seeds/cocoapod/vanillapod + name = "pack of vanilla pod seeds" + desc = "These seeds grow into vanilla trees. They look fattening." + icon_state = "seed-vanillapod" + species = "vanillapod" + plantname = "Vanilla Tree" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/vanillapod + mutatelist = list() + +/obj/item/weapon/reagent_containers/food/snacks/grown/vanillapod + seed = /obj/item/seeds/cocoapod/vanillapod + name = "vanilla pod" + desc = "Fattening... Mmmmm... vanilla." + icon_state = "vanillapod" + filling_color = "#FFD700" + reagents_add = list("vanilla" = 0.25, "nutriment" = 0.1) \ No newline at end of file diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm new file mode 100644 index 00000000000..69613489e56 --- /dev/null +++ b/code/modules/hydroponics/grown/corn.dm @@ -0,0 +1,81 @@ +// Corn +/obj/item/seeds/corn + name = "pack of corn seeds" + desc = "I don't mean to sound corny..." + icon_state = "seed-corn" + species = "corn" + plantname = "Corn Stalks" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/corn + maturation = 8 + oneharvest = 1 + potency = 20 + growthstages = 3 + mutatelist = list(/obj/item/seeds/corn/snapcorn) + +/obj/item/weapon/reagent_containers/food/snacks/grown/corn + seed = /obj/item/seeds/corn + name = "ear of corn" + desc = "Needs some butter!" + icon_state = "corn" + cooked_type = /obj/item/weapon/reagent_containers/food/snacks/popcorn + filling_color = "#FFFF00" + trash = /obj/item/weapon/grown/corncob + reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1) + bitesize_mod = 2 + +/obj/item/weapon/grown/corncob + name = "corn cob" + desc = "A reminder of meals gone by." + icon_state = "corncob" + item_state = "corncob" + w_class = 1 + throwforce = 0 + throw_speed = 3 + throw_range = 7 + +/obj/item/weapon/grown/corncob/attackby(obj/item/weapon/grown/W, mob/user, params) + ..() + if(W.is_sharp()) + user << "You use [W] to fashion a pipe out of the corn cob!" + new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc) + user.unEquip(src) + qdel(src) + return + +// Snapcorn +/obj/item/seeds/corn/snapcorn + name = "pack of snapcorn seeds" + desc = "Oh snap!" + icon_state = "seed-snapcorn" + species = "snapcorn" + plantname = "Snapcorn Stalks" + product = /obj/item/weapon/grown/snapcorn + mutatelist = list() + rarity = 10 + +/obj/item/weapon/grown/snapcorn + seed = /obj/item/seeds/corn/snapcorn + name = "snap corn" + desc = "A cob with snap pops" + icon_state = "snapcorn" + item_state = "corncob" + w_class = 1 + throwforce = 0 + throw_speed = 3 + throw_range = 7 + var/snap_pops = 1 + +/obj/item/weapon/grown/snapcorn/add_juice() + ..() + snap_pops = max(round(potency/8), 1) + +/obj/item/weapon/grown/snapcorn/attack_self(mob/user) + ..() + user << "You pick up a snap pops from the cob." + var/obj/item/toy/snappop/S = new /obj/item/toy/snappop(user.loc) + if(ishuman(user)) + user.put_in_hands(S) + snap_pops -= 1 + if(!snap_pops) + new /obj/item/weapon/grown/corncob(user.loc) + qdel(src) \ No newline at end of file diff --git a/code/modules/hydroponics/grown/eggplant.dm b/code/modules/hydroponics/grown/eggplant.dm new file mode 100644 index 00000000000..2fc972992a0 --- /dev/null +++ b/code/modules/hydroponics/grown/eggplant.dm @@ -0,0 +1,41 @@ +// Eggplant +/obj/item/seeds/eggplant + name = "pack of eggplant seeds" + desc = "These seeds grow to produce berries that look nothing like eggs." + icon_state = "seed-eggplant" + species = "eggplant" + plantname = "Eggplants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant + yield = 2 + potency = 20 + mutatelist = list(/obj/item/seeds/eggplant/eggy) + +/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant + seed = /obj/item/seeds/eggplant + name = "eggplant" + desc = "Maybe there's a chicken inside?" + icon_state = "eggplant" + filling_color = "#800080" + reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1) + bitesize_mod = 2 + +// Egg-Plant +/obj/item/seeds/eggplant/eggy + desc = "These seeds grow to produce berries that look a lot like eggs." + icon_state = "seed-eggy" + species = "eggy" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy + lifespan = 75 + production = 12 + mutatelist = list() + // No rarity: Centcom ships these to us in the exotic seeds crate. + +/obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy + seed = /obj/item/seeds/eggplant/eggy + name = "Egg-plant" + desc = "There MUST be a chicken inside." + icon_state = "eggyplant" + trash = /obj/item/weapon/reagent_containers/food/snacks/egg + filling_color = "#F8F8FF" + reagents_add = list("nutriment" = 0.1) + bitesize_mod = 2 \ No newline at end of file diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 530207d1567..ec0f0e7a493 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -1,6 +1,21 @@ // Poppy +/obj/item/seeds/poppy + name = "pack of poppy seeds" + desc = "These seeds grow into poppies." + icon_state = "seed-poppy" + species = "poppy" + plantname = "Poppy Plants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/poppy + endurance = 10 + maturation = 8 + yield = 6 + potency = 20 + oneharvest = 1 + growthstages = 3 + mutatelist = list(/obj/item/seeds/poppy/geranium, /obj/item/seeds/poppy/lily) + /obj/item/weapon/reagent_containers/food/snacks/grown/poppy - seed = /obj/item/seeds/poppyseed + seed = /obj/item/seeds/poppy name = "poppy" desc = "Long-used as a symbol of rest, peace, and death." icon_state = "poppy" @@ -9,19 +24,35 @@ reagents_add = list("salglu_solution" = 0.05, "nutriment" = 0.05) bitesize_mod = 3 - // Lily +/obj/item/seeds/poppy/lily + name = "pack of lily seeds" + desc = "These seeds grow into lilies." + icon_state = "seed-lily" + species = "lily" + plantname = "Lily Plants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/lily + mutatelist = list() + /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/lily - seed = /obj/item/seeds/lilyseed + seed = /obj/item/seeds/poppy/lily name = "lily" desc = "A beautiful orange flower" icon_state = "lily" filling_color = "#FFA500" - // Geranium +/obj/item/seeds/poppy/geranium + name = "pack of geranium seeds" + desc = "These seeds grow into geranium." + icon_state = "seed-geranium" + species = "geranium" + plantname = "Geranium Plants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/geranium + mutatelist = list() + /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/geranium - seed = /obj/item/seeds/geraniumseed + seed = /obj/item/seeds/poppy/geranium name = "geranium" desc = "A beautiful blue flower" icon_state = "geranium" @@ -29,6 +60,23 @@ // Harebell +/obj/item/seeds/harebell + name = "pack of harebell seeds" + desc = "These seeds grow into pretty little flowers." + icon_state = "seed-harebell" + species = "harebell" + plantname = "Harebells" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/harebell + lifespan = 100 + endurance = 20 + maturation = 7 + production = 1 + yield = 2 + potency = 30 + oneharvest = 1 + growthstages = 4 + plant_type = 1 + /obj/item/weapon/reagent_containers/food/snacks/grown/harebell seed = /obj/item/seeds/harebell name = "harebell" @@ -41,12 +89,109 @@ // Moonflower +/obj/item/seeds/sunflower/moonflower + name = "pack of moonflower seeds" + desc = "These seeds grow into moonflowers." + icon_state = "seed-moonflower" + species = "moonflower" + plantname = "Moonflowers" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/moonflower + mutatelist = list() + rarity = 15 + /obj/item/weapon/reagent_containers/food/snacks/grown/moonflower - seed = /obj/item/seeds/moonflowerseed + seed = /obj/item/seeds/sunflower/moonflower name = "moonflower" desc = "Store in a location at least 50 yards away from werewolves." icon_state = "moonflower" slot_flags = SLOT_HEAD filling_color = "#E6E6FA" reagents_add = list("moonshine" = 0.1, "vitamin" = 0.02, "nutriment" = 0.02) - bitesize_mod = 2 \ No newline at end of file + bitesize_mod = 2 + +// Sunflower +/obj/item/seeds/sunflower + name = "pack of sunflower seeds" + desc = "These seeds grow into sunflowers." + icon_state = "seed-sunflower" + species = "sunflower" + plantname = "Sunflowers" + product = /obj/item/weapon/grown/sunflower + endurance = 20 + production = 2 + yield = 2 + oneharvest = 1 + growthstages = 3 + mutatelist = list(/obj/item/seeds/sunflower/moonflower, /obj/item/seeds/sunflower/novaflower) + +/obj/item/weapon/grown/sunflower // FLOWER POWER! + seed = /obj/item/seeds/sunflower + name = "sunflower" + desc = "It's beautiful! A certain person might beat you to death if you trample these." + icon_state = "sunflower" + damtype = "fire" + force = 0 + slot_flags = SLOT_HEAD + throwforce = 0 + w_class = 1 + throw_speed = 1 + throw_range = 3 + +/obj/item/weapon/grown/sunflower/attack(mob/M, mob/user) + M << " [user] smacks you with a sunflower!FLOWER POWER" + user << "Your sunflower's FLOWER POWERstrikes [M]" + +// Novaflower +/obj/item/seeds/sunflower/novaflower + name = "pack of novaflower seeds" + desc = "These seeds grow into novaflowers." + icon_state = "seed-novaflower" + species = "novaflower" + plantname = "Novaflowers" + product = /obj/item/weapon/grown/novaflower + mutatelist = list() + rarity = 20 + +/obj/item/weapon/grown/novaflower + seed = /obj/item/seeds/sunflower/novaflower + name = "novaflower" + desc = "These beautiful flowers have a crisp smokey scent, like a summer bonfire." + icon_state = "novaflower" + damtype = "fire" + force = 0 + slot_flags = SLOT_HEAD + throwforce = 0 + w_class = 1 + throw_speed = 1 + throw_range = 3 + plant_type = 0 + attack_verb = list("roasted", "scorched", "burned") + +/obj/item/weapon/grown/novaflower/add_juice() + if(..()) + reagents.add_reagent("nutriment", 1) + reagents.add_reagent("capsaicin", round((potency / 3.5), 1)) + reagents.add_reagent("condensedcapsaicin", round((potency / 4), 1)) + force = round((5 + potency / 5), 1) + +/obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M, mob/user) + if(!..()) return + if(istype(M, /mob/living)) + M << "You are lit on fire from the intense heat of the [name]!" + M.adjust_fire_stacks(potency / 20) + M.IgniteMob() + +/obj/item/weapon/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity) + if(!proximity) return + if(endurance > 0) + endurance -= rand(1, (endurance / 3) + 1) + else + usr << "All the petals have fallen off the [name] from violent whacking!" + usr.unEquip(src) + qdel(src) + +/obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user) + ..() + if(!user.gloves) + user << "The [name] burns your bare hand!" + user.adjustFireLoss(rand(1, 5)) \ No newline at end of file diff --git a/code/modules/hydroponics/grown/grass_carpet.dm b/code/modules/hydroponics/grown/grass_carpet.dm index c351893109b..ac7ba622839 100644 --- a/code/modules/hydroponics/grown/grass_carpet.dm +++ b/code/modules/hydroponics/grown/grass_carpet.dm @@ -1,5 +1,21 @@ +// Grass +/obj/item/seeds/grass + name = "pack of grass seeds" + desc = "These seeds grow into grass. Yummy!" + icon_state = "seed-grass" + species = "grass" + plantname = "Grass" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/grass + lifespan = 40 + endurance = 40 + maturation = 2 + production = 5 + yield = 5 + growthstages = 2 + mutatelist = list(/obj/item/seeds/grass/carpet) + /obj/item/weapon/reagent_containers/food/snacks/grown/grass - seed = /obj/item/seeds/grassseed + seed = /obj/item/seeds/grass name = "grass" desc = "Green and lush." icon_state = "grassclump" @@ -26,9 +42,19 @@ qdel(src) return +// Carpet +/obj/item/seeds/grass/carpet + name = "pack of carpet seeds" + desc = "These seeds grow into stylish carpet samples." + icon_state = "seed-carpet" + species = "carpet" + plantname = "Carpet" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/carpet + mutatelist = list(/obj/item/seeds/grass/carpet) + rarity = 10 /obj/item/weapon/reagent_containers/food/snacks/grown/carpet - seed = /obj/item/seeds/carpetseed + seed = /obj/item/seeds/grass/carpet name = "carpet" desc = "The textile industry's dark secret." icon_state = "carpetclump" diff --git a/code/modules/hydroponics/grown/kudzu.dm b/code/modules/hydroponics/grown/kudzu.dm new file mode 100644 index 00000000000..6cd35cf49a4 --- /dev/null +++ b/code/modules/hydroponics/grown/kudzu.dm @@ -0,0 +1,96 @@ +// A very special plant, deserving it's own file. + +/obj/item/seeds/kudzu + name = "pack of kudzu seeds" + desc = "These seeds grow into a weed that grows incredibly fast." + icon_state = "seed-kudzu" + species = "kudzu" + plantname = "Kudzu" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod + lifespan = 20 + endurance = 10 + yield = 4 + growthstages = 4 + plant_type = 1 + rarity = 30 + var/list/mutations = list() + +/obj/item/seeds/kudzu/New(loc, obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod/parent) + ..() + if(parent) + mutations = parent.mutations + +/obj/item/seeds/kudzu/suicide_act(mob/user) + user.visible_message("[user] swallows the pack of kudzu seeds! It looks like \he's trying to commit suicide..") + plant(user) + return (BRUTELOSS) + +/obj/item/seeds/kudzu/harvest() + var/list/prod = ..() + for(var/obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod/K in prod) + K.mutations = mutations + +/obj/item/seeds/kudzu/proc/plant(mob/user) + if(istype(user.loc,/turf/space)) + return + var/turf/T = get_turf(src) + message_admins("Kudzu planted by [key_name_admin(user)](?) (FLW) at ([T.x],[T.y],[T.z] - (JMP))",0,1) + investigate_log("was planted by [key_name(user)] at ([T.x],[T.y],[T.z])","kudzu") + new /obj/effect/spacevine_controller(user.loc, mutations, potency, production) + qdel(src) + +/obj/item/seeds/kudzu/attack_self(mob/user) + plant(user) + user << "You plant the kudzu. You monster." + +/obj/item/seeds/kudzu/get_analyzer_text() + var/list/mut_text = list() + var/text_string = "" + for(var/datum/spacevine_mutation/SM in mutations) + text_string += "[(text_string == "") ? "" : ", "][SM.name]" + mut_text += "-Plant Mutations: [(text_string == "") ? "None" : text_string]" + return mut_text + +/obj/item/seeds/kudzu/on_chem_reaction(datum/reagents/S) + + var/list/temp_mut_list = list() + + if(S.has_reagent("sterilizine", 5)) + for(var/datum/spacevine_mutation/SM in mutations) + if(SM.quality == NEGATIVE) + temp_mut_list += SM + if(prob(20)) + mutations.Remove(pick(temp_mut_list)) + temp_mut_list.Cut() + if(S.has_reagent("welding_fuel", 5)) + for(var/datum/spacevine_mutation/SM in mutations) + if(SM.quality == POSITIVE) + temp_mut_list += SM + if(prob(20)) + mutations.Remove(pick(temp_mut_list)) + temp_mut_list.Cut() + if(S.has_reagent("phenol", 5)) + for(var/datum/spacevine_mutation/SM in mutations) + if(SM.quality == MINOR_NEGATIVE) + temp_mut_list += SM + if(prob(20)) + mutations.Remove(pick(temp_mut_list)) + if(S.has_reagent("blood", 15)) + production += rand(15, -5) + if(S.has_reagent("amatoxin", 5)) + production += rand(5, -15) + if(S.has_reagent("plasma", 5)) + potency += rand(5, -15) + if(S.has_reagent("holywater", 10)) + potency += rand(15, -5) + + +/obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod + seed = /obj/item/seeds/kudzu + name = "kudzu pod" + desc = "Pueraria Virallis: An invasive species with vines that rapidly creep and wrap around whatever they contact." + icon_state = "kudzupod" + var/list/mutations = list() + filling_color = "#6B8E23" + bitesize_mod = 2 + reagents_add = list("charcoal" = 0.04, "nutriment" = 0.02) \ No newline at end of file diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm index 4f6d17c0ab6..333c6d8ece4 100644 --- a/code/modules/hydroponics/grown/melon.dm +++ b/code/modules/hydroponics/grown/melon.dm @@ -1,5 +1,17 @@ +// Watermelon +/obj/item/seeds/watermelon + name = "pack of watermelon seeds" + desc = "These seeds grow into watermelon plants." + icon_state = "seed-watermelon" + species = "watermelon" + plantname = "Watermelon Vines" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/watermelon + lifespan = 50 + endurance = 40 + mutatelist = list(/obj/item/seeds/watermelon/holy) + /obj/item/weapon/reagent_containers/food/snacks/grown/watermelon - seed = /obj/item/seeds/watermelonseed + seed = /obj/item/seeds/watermelon name = "watermelon" desc = "It's full of watery goodness." icon_state = "watermelon" @@ -11,9 +23,19 @@ reagents_add = list("vitamin" = 0.04, "nutriment" = 0.2, "water" = 0.1) bitesize_mod = 3 +// Holymelon +/obj/item/seeds/watermelon/holy + name = "pack of holymelon seeds" + desc = "These seeds grow into holymelon plants." + icon_state = "seed-holymelon" + species = "holymelon" + plantname = "Holy Melon Vines" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/holymelon + mutatelist = list() + rarity = 20 /obj/item/weapon/reagent_containers/food/snacks/grown/holymelon - seed = /obj/item/seeds/holymelonseed + seed = /obj/item/seeds/watermelon/holy name = "holymelon" desc = "The water within this melon has been blessed by some deity that's particularly fond of watermelon." icon_state = "holymelon" diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index 64fcb25a627..e0bcf8ec59a 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -1,17 +1,39 @@ -/obj/item/weapon/reagent_containers/food/snacks/grown/corn - seed = /obj/item/seeds/cornseed - name = "ear of corn" - desc = "Needs some butter!" - icon_state = "corn" - cooked_type = /obj/item/weapon/reagent_containers/food/snacks/popcorn - filling_color = "#FFFF00" - trash = /obj/item/weapon/grown/corncob - reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1) - bitesize_mod = 2 +// Weeds +/obj/item/seeds/weeds + name = "pack of weed seeds" + desc = "Yo mang, want some weeds?" + icon_state = "seed" + species = "weeds" + plantname = "Starthistle" + lifespan = 100 + endurance = 50 // damm pesky weeds + maturation = 5 + production = 1 + yield = -1 + potency = -1 + oneharvest = 1 + growthstages = 4 + plant_type = 1 +// Cabbage +/obj/item/seeds/cabbage + name = "pack of cabbage seeds" + desc = "These seeds grow into cabbages." + icon_state = "seed-cabbage" + species = "cabbage" + plantname = "Cabbages" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage + lifespan = 50 + endurance = 25 + maturation = 3 + production = 5 + yield = 4 + growthstages = 1 + mutatelist = list(/obj/item/seeds/replicapod) + /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage - seed = /obj/item/seeds/cabbageseed + seed = /obj/item/seeds/cabbage name = "cabbage" desc = "Ewwwwwwwwww. Cabbage." icon_state = "cabbage" @@ -20,25 +42,22 @@ bitesize_mod = 2 -/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod - seed = /obj/item/seeds/cocoapodseed - name = "cocoa pod" - desc = "Fattening... Mmmmm... chucklate." - icon_state = "cocoapod" - filling_color = "#FFD700" - reagents_add = list("cocoa" = 0.25, "nutriment" = 0.1) - bitesize_mod = 2 - -/obj/item/weapon/reagent_containers/food/snacks/grown/vanillapod - seed = /obj/item/seeds/vanillapodseed - name = "vanilla pod" - desc = "Fattening... Mmmmm... vanilla." - icon_state = "vanillapod" - filling_color = "#FFD700" - reagents_add = list("vanilla" = 0.25, "nutriment" = 0.1) +// Sugarcane +/obj/item/seeds/sugarcane + name = "pack of sugarcane seeds" + desc = "These seeds grow into sugarcane." + icon_state = "seed-sugarcane" + species = "sugarcane" + plantname = "Sugarcane" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane + lifespan = 60 + endurance = 50 + maturation = 3 + yield = 4 + growthstages = 3 /obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane - seed = /obj/item/seeds/sugarcaneseed + seed = /obj/item/seeds/sugarcane name = "sugarcane" desc = "Sickly sweet." icon_state = "sugarcane" @@ -46,75 +65,25 @@ reagents_add = list("sugar" = 0.25) bitesize_mod = 2 -/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin - seed = /obj/item/seeds/pumpkinseed - name = "pumpkin" - desc = "It's large and scary." - icon_state = "pumpkin" - filling_color = "#FFA500" - reagents_add = list("vitamin" = 0.04, "nutriment" = 0.2) - bitesize_mod = 2 -/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/weapon/W as obj, mob/user as mob, params) - ..() - if(W.is_sharp()) - user.show_message("You carve a face into [src]!", 1) - new /obj/item/clothing/head/hardhat/pumpkinhead(user.loc) - qdel(src) - return +// Gatfruit +/obj/item/seeds/gatfruit + name = "pack of gatfruit seeds" + desc = "These seeds grow into .357 revolvers." + icon_state = "seed-gatfruit" + species = "gatfruit" + plantname = "gatfruit" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/shell/gatfruit + lifespan = 20 + endurance = 20 + maturation = 40 + production = 10 + yield = 2 + potency = 60 + growthstages = 2 + rarity = 60 // Obtainable only with xenobio+superluck. -/obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin - seed = /obj/item/seeds/blumpkinseed - name = "blumpkin" - desc = "The pumpkin's toxic sibling." - icon_state = "blumpkin" - filling_color = "#87CEFA" - reagents_add = list("ammonia" = 0.2, "nutriment" = 0.2) - bitesize_mod = 2 - - -/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant - seed = /obj/item/seeds/eggplantseed - name = "eggplant" - desc = "Maybe there's a chicken inside?" - icon_state = "eggplant" - filling_color = "#800080" - reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1) - bitesize_mod = 2 - - -/obj/item/weapon/reagent_containers/food/snacks/grown/shell - var/inside_type = null - -/obj/item/weapon/reagent_containers/food/snacks/grown/shell/attack_self(mob/user as mob) - if(inside_type) - new inside_type(user.loc) - user.unEquip(src) - qdel(src) - -/obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy - seed = /obj/item/seeds/eggyseed - name = "Egg-plant" - desc = "There MUST be a chicken inside." - icon_state = "eggyplant" - inside_type = /obj/item/weapon/reagent_containers/food/snacks/egg - filling_color = "#F8F8FF" - reagents_add = list("nutriment" = 0.1) - bitesize_mod = 2 - - -/obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod - seed = /obj/item/seeds/kudzuseed - name = "kudzu pod" - desc = "Pueraria Virallis: An invasive species with vines that rapidly creep and wrap around whatever they contact." - icon_state = "kudzupod" - var/list/mutations = list() - filling_color = "#6B8E23" - bitesize_mod = 2 - reagents_add = list("charcoal" = 0.04, "nutriment" = 0.02) - - -/obj/item/weapon/reagent_containers/food/snacks/grown/gatfruit +/obj/item/weapon/reagent_containers/food/snacks/grown/shell/gatfruit seed = /obj/item/seeds/gatfruit name = "gatfruit" desc = "It smells like burning." diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 9679bc74081..a105a3aa182 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -4,8 +4,25 @@ // Reishi +/obj/item/seeds/reishi + name = "pack of reishi mycelium" + desc = "This mycelium grows into something medicinal and relaxing." + icon_state = "mycelium-reishi" + species = "reishi" + plantname = "Reishi" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi + lifespan = 35 + endurance = 35 + maturation = 10 + production = 5 + yield = 4 + potency = 15 + oneharvest = 1 + growthstages = 4 + plant_type = 2 + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi - seed = /obj/item/seeds/reishimycelium + seed = /obj/item/seeds/reishi name = "reishi" desc = "Ganoderma lucidum: A special fungus known for its medicinal and stress relieving properties." icon_state = "reishi" @@ -14,8 +31,25 @@ // Fly Amanita +/obj/item/seeds/amanita + name = "pack of fly amanita mycelium" + desc = "This mycelium grows into something horrible." + icon_state = "mycelium-amanita" + species = "amanita" + plantname = "Fly Amanitas" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita + lifespan = 50 + endurance = 35 + maturation = 10 + production = 5 + yield = 4 + oneharvest = 1 + growthstages = 3 + plant_type = 2 + mutatelist = list(/obj/item/seeds/angel) + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita - seed = /obj/item/seeds/amanitamycelium + seed = /obj/item/seeds/amanita name = "fly amanita" desc = "Amanita Muscaria: Learn poisonous mushrooms by heart. Only pick mushrooms you know." icon_state = "amanita" @@ -24,8 +58,26 @@ // Destroying Angel +/obj/item/seeds/angel + name = "pack of destroying angel mycelium" + desc = "This mycelium grows into something devastating." + icon_state = "mycelium-angel" + species = "angel" + plantname = "Destroying Angels" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel + lifespan = 50 + endurance = 35 + maturation = 12 + production = 5 + yield = 2 + potency = 35 + oneharvest = 1 + growthstages = 3 + plant_type = 2 + rarity = 30 + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel - seed = /obj/item/seeds/angelmycelium + seed = /obj/item/seeds/angel name = "destroying angel" desc = "Amanita Virosa: Deadly poisonous basidiomycete fungus filled with alpha amatoxins." icon_state = "angel" @@ -34,8 +86,23 @@ // Liberty Cap +/obj/item/seeds/liberty + name = "pack of liberty-cap mycelium" + desc = "This mycelium grows into liberty-cap mushrooms." + icon_state = "mycelium-liberty" + species = "liberty" + plantname = "Liberty-Caps" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap + maturation = 7 + production = 1 + yield = 5 + potency = 15 + oneharvest = 1 + growthstages = 3 + plant_type = 2 + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap - seed = /obj/item/seeds/libertymycelium + seed = /obj/item/seeds/liberty name = "liberty-cap" desc = "Psilocybe Semilanceata: Liberate yourself!" icon_state = "libertycap" @@ -44,8 +111,24 @@ // Plump Helmet +/obj/item/seeds/plump + name = "pack of plump-helmet mycelium" + desc = "This mycelium grows into helmets... maybe." + icon_state = "mycelium-plump" + species = "plump" + plantname = "Plump-Helmet Mushrooms" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet + maturation = 8 + production = 1 + yield = 4 + potency = 15 + oneharvest = 1 + growthstages = 3 + plant_type = 2 + mutatelist = list(/obj/item/seeds/plump/walkingmushroom) + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet - seed = /obj/item/seeds/plumpmycelium + seed = /obj/item/seeds/plump name = "plump-helmet" desc = "Plumus Hellmus: Plump, soft and s-so inviting~" icon_state = "plumphelmet" @@ -54,8 +137,22 @@ // Walking Mushroom +/obj/item/seeds/plump/walkingmushroom + name = "pack of walking mushroom mycelium" + desc = "This mycelium will grow into huge stuff!" + icon_state = "mycelium-walkingmushroom" + species = "walkingmushroom" + plantname = "Walking Mushrooms" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom + lifespan = 30 + endurance = 30 + maturation = 5 + yield = 1 + mutatelist = list() + rarity = 30 + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom - seed = /obj/item/seeds/walkingmushroommycelium + seed = /obj/item/seeds/plump/walkingmushroom name = "walking mushroom" desc = "Plumus Locomotus: The beginning of the great walk." icon_state = "walkingmushroom" @@ -76,8 +173,25 @@ // Chanterelle +/obj/item/seeds/chanter + name = "pack of chanterelle mycelium" + desc = "This mycelium grows into chanterelle mushrooms." + icon_state = "mycelium-chanter" + species = "chanter" + plantname = "Chanterelle Mushrooms" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle + lifespan = 35 + endurance = 20 + maturation = 7 + production = 1 + yield = 5 + potency = 15 + oneharvest = 1 + growthstages = 3 + plant_type = 2 + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle - seed = /obj/item/seeds/chantermycelium + seed = /obj/item/seeds/chanter name = "chanterelle cluster" desc = "Cantharellus Cibarius: These jolly yellow little shrooms sure look tasty!" icon_state = "chanterelle" @@ -86,6 +200,25 @@ // Glowshroom +/obj/item/seeds/glowshroom + name = "pack of glowshroom mycelium" + desc = "This mycelium -glows- into mushrooms!" + icon_state = "mycelium-glowshroom" + species = "glowshroom" + plantname = "Glowshrooms" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom + lifespan = 120 //ten times that is the delay + endurance = 30 + maturation = 15 + production = 1 + yield = 3 //-> spread + potency = 30 //-> brightness + oneharvest = 1 + growthstages = 4 + plant_type = 2 + rarity = 20 + mutatelist = list(/obj/item/seeds/glowshroom/glowcap) + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom seed = /obj/item/seeds/glowshroom name = "glowshroom cluster" @@ -138,8 +271,18 @@ // Glowcap +/obj/item/seeds/glowshroom/glowcap + name = "pack of glowcap mycelium" + desc = "This mycelium -powers- into mushrooms!" + icon_state = "mycelium-glowcap" + species = "glowcap" + plantname = "Glowcaps" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap + mutatelist = list() + rarity = 30 + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap - seed = /obj/item/seeds/glowcap + seed = /obj/item/seeds/glowshroom/glowcap name = "glowcap cluster" desc = "Mycena Ruthenia: This species of mushroom glows in the dark, but aren't bioluminescent. They're warm to the touch..." icon_state = "glowcap" diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm new file mode 100644 index 00000000000..881918bcb82 --- /dev/null +++ b/code/modules/hydroponics/grown/nettle.dm @@ -0,0 +1,117 @@ +/obj/item/seeds/nettle + name = "pack of nettle seeds" + desc = "These seeds grow into nettles." + icon_state = "seed-nettle" + species = "nettle" + plantname = "Nettles" + product = /obj/item/weapon/grown/nettle/basic + lifespan = 30 + endurance = 40 // tuff like a toiger + yield = 4 + growthstages = 5 + plant_type = 1 + mutatelist = list(/obj/item/seeds/nettle/death) + +/obj/item/seeds/nettle/death + name = "pack of death-nettle seeds" + desc = "These seeds grow into death-nettles." + icon_state = "seed-deathnettle" + species = "deathnettle" + plantname = "Death Nettles" + product = /obj/item/weapon/grown/nettle/death + endurance = 25 + maturation = 8 + yield = 2 + mutatelist = list() + rarity = 10 + + +/obj/item/weapon/grown/nettle //abstract type + name = "nettle" + desc = "It's probably not wise to touch it with bare hands..." + icon = 'icons/obj/weapons.dmi' + icon_state = "nettle" + damtype = "fire" + force = 15 + hitsound = 'sound/weapons/bladeslice.ogg' + throwforce = 5 + w_class = 1 + throw_speed = 1 + throw_range = 3 + plant_type = 1 + origin_tech = "combat=1" + attack_verb = list("stung") + +/obj/item/weapon/grown/nettle/suicide_act(mob/user) + user.visible_message("[user] is eating some of the [src.name]! It looks like \he's trying to commit suicide.") + return (BRUTELOSS|TOXLOSS) + +/obj/item/weapon/grown/nettle/pickup(mob/living/user) + ..() + if(!iscarbon(user)) + return 0 + var/mob/living/carbon/C = user + if(ishuman(user)) + var/mob/living/carbon/human/H = C + if(H.gloves) + return 0 + var/organ = ((H.hand ? "l_":"r_") + "arm") + var/obj/item/organ/limb/affecting = H.get_organ(organ) + if(affecting.take_damage(0, force)) + H.update_damage_overlays(0) + else + C.take_organ_damage(0,force) + C << "The nettle burns your bare hand!" + return 1 + +/obj/item/weapon/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity) + if(!proximity) return + if(force > 0) + force -= rand(1, (force / 3) + 1) // When you whack someone with it, leaves fall off + else + usr << "All the leaves have fallen off the nettle from violent whacking." + usr.unEquip(src) + qdel(src) + + +/obj/item/weapon/grown/nettle/basic + seed = /obj/item/seeds/nettle + +/obj/item/weapon/grown/nettle/basic/add_juice() + ..() + reagents.add_reagent("sacid", round((potency / 2), 1)) + force = round((5 + potency / 5), 1) + + +/obj/item/weapon/grown/nettle/death + seed = /obj/item/seeds/nettle/death + name = "deathnettle" + desc = "The glowing nettle incites rage in you just from looking at it!" + icon_state = "deathnettle" + force = 30 + throwforce = 15 + origin_tech = "combat=3" + +/obj/item/weapon/grown/nettle/death/add_juice() + ..() + reagents.add_reagent("facid", round((potency / 2), 1)) + force = round((5 + potency / 2.5), 1) + +/obj/item/weapon/grown/nettle/death/pickup(mob/living/carbon/user) + ..() + if(..()) + if(prob(50)) + user.Paralyse(5) + user << "You are stunned by the Deathnettle when you try picking it up!" + +/obj/item/weapon/grown/nettle/death/attack(mob/living/carbon/M, mob/user) + if(!..()) return + if(istype(M, /mob/living)) + M << "You are stunned by the powerful acid of the Deathnettle!" + add_logs(user, M, "attacked", src) + + M.adjust_blurriness(force/7) + if(prob(20)) + M.Paralyse(force / 6) + M.Weaken(force / 15) + M.drop_item() \ No newline at end of file diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm index a1d34cb3040..9d76bf0d135 100644 --- a/code/modules/hydroponics/grown/potato.dm +++ b/code/modules/hydroponics/grown/potato.dm @@ -1,5 +1,21 @@ +// Potato +/obj/item/seeds/potato + name = "pack of potato seeds" + desc = "Boil 'em! Mash 'em! Stick 'em in a stew!" + icon_state = "seed-potato" + species = "potato" + plantname = "Potato Plants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/potato + lifespan = 30 + maturation = 10 + production = 1 + yield = 4 + oneharvest = 1 + growthstages = 4 + mutatelist = list(/obj/item/seeds/potato/sweet) + /obj/item/weapon/reagent_containers/food/snacks/grown/potato - seed = /obj/item/seeds/potatoseed + seed = /obj/item/seeds/potato name = "potato" desc = "Boil 'em! Mash 'em! Stick 'em in a stew!" icon_state = "potato" @@ -22,8 +38,18 @@ user << "You need five lengths of cable to make a potato battery!" return +// Sweet Potato +/obj/item/seeds/potato/sweet + name = "pack of sweet potato seeds" + desc = "These seeds grow into sweet potato plants." + icon_state = "seed-sweetpotato" + species = "sweetpotato" + plantname = "Sweet Potato Plants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/potato/sweet + mutatelist = list() + /obj/item/weapon/reagent_containers/food/snacks/grown/potato/sweet - seed = /obj/item/seeds/sweetpotatoseed + seed = /obj/item/seeds/potato/sweet name = "sweet potato" desc = "It's sweet." icon_state = "sweetpotato" diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm new file mode 100644 index 00000000000..4e6629633ab --- /dev/null +++ b/code/modules/hydroponics/grown/pumpkin.dm @@ -0,0 +1,49 @@ +// Pumpkin +/obj/item/seeds/pumpkin + name = "pack of pumpkin seeds" + desc = "These seeds grow into pumpkin vines." + icon_state = "seed-pumpkin" + species = "pumpkin" + plantname = "Pumpkin Vines" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin + lifespan = 50 + endurance = 40 + growthstages = 3 + mutatelist = list(/obj/item/seeds/pumpkin/blumpkin) + +/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin + seed = /obj/item/seeds/pumpkin + name = "pumpkin" + desc = "It's large and scary." + icon_state = "pumpkin" + filling_color = "#FFA500" + reagents_add = list("vitamin" = 0.04, "nutriment" = 0.2) + bitesize_mod = 2 + +/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/weapon/W as obj, mob/user as mob, params) + ..() + if(W.is_sharp()) + user.show_message("You carve a face into [src]!", 1) + new /obj/item/clothing/head/hardhat/pumpkinhead(user.loc) + qdel(src) + return + +// Blumpkin +/obj/item/seeds/pumpkin/blumpkin + name = "pack of blumpkin seeds" + desc = "These seeds grow into blumpkin vines." + icon_state = "seed-blumpkin" + species = "blumpkin" + plantname = "Blumpkin Vines" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin + mutatelist = list() + rarity = 20 + +/obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin + seed = /obj/item/seeds/pumpkin/blumpkin + name = "blumpkin" + desc = "The pumpkin's toxic sibling." + icon_state = "blumpkin" + filling_color = "#87CEFA" + reagents_add = list("ammonia" = 0.2, "nutriment" = 0.2) + bitesize_mod = 2 \ No newline at end of file diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm new file mode 100644 index 00000000000..9ac54b1f36d --- /dev/null +++ b/code/modules/hydroponics/grown/replicapod.dm @@ -0,0 +1,45 @@ +// A very special plant, deserving it's own file. + +/obj/item/seeds/replicapod + name = "pack of replica pod seeds" + desc = "These seeds grow into replica pods. They say these are used to harvest humans." + icon_state = "seed-replicapod" + species = "replicapod" + plantname = "Replica Pod" + product = /mob/living/carbon/human //verrry special -- Urist + lifespan = 50 + endurance = 8 + maturation = 10 + production = 1 + yield = 1 //seeds if there isn't a dna inside + oneharvest = 1 + potency = 30 + var/ckey = null + var/realName = null + var/datum/mind/mind = null + var/blood_gender = null + var/blood_type = null + var/list/features = null + var/factions = null + var/contains_sample = 0 + +/obj/item/seeds/replicapod/attackby(obj/item/weapon/W, mob/user, params) + if(istype(W,/obj/item/weapon/reagent_containers/syringe)) + if(!contains_sample) + for(var/datum/reagent/blood/bloodSample in W.reagents.reagent_list) + if(bloodSample.data["mind"] && bloodSample.data["cloneable"] == 1) + mind = bloodSample.data["mind"] + ckey = bloodSample.data["ckey"] + realName = bloodSample.data["real_name"] + blood_gender = bloodSample.data["gender"] + blood_type = bloodSample.data["blood_type"] + features = bloodSample.data["features"] + factions = bloodSample.data["factions"] + W.reagents.clear_reagents() + user << "You inject the contents of the syringe into the seeds." + contains_sample = 1 + else + user << "The seeds reject the sample!" + else + user << "The seeds already contain a genetic sample!" + ..() \ No newline at end of file diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm index e97874ffba2..6803a15c6e6 100644 --- a/code/modules/hydroponics/grown/root.dm +++ b/code/modules/hydroponics/grown/root.dm @@ -1,5 +1,20 @@ +// Carrot +/obj/item/seeds/carrot + name = "pack of carrot seeds" + desc = "These seeds grow into carrots." + icon_state = "seed-carrot" + species = "carrot" + plantname = "Carrots" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/carrot + maturation = 10 + production = 1 + yield = 5 + oneharvest = 1 + growthstages = 3 + mutatelist = list(/obj/item/seeds/carrot/parsnip) + /obj/item/weapon/reagent_containers/food/snacks/grown/carrot - seed = /obj/item/seeds/carrotseed + seed = /obj/item/seeds/carrot name = "carrot" desc = "It's good for the eyes!" icon_state = "carrot" @@ -18,8 +33,41 @@ else return ..() +// Parsnip +/obj/item/seeds/carrot/parsnip + name = "pack of parsnip seeds" + desc = "These seeds grow into parsnips." + icon_state = "seed-parsnip" + species = "parsnip" + plantname = "Parsnip" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/parsnip + mutatelist = list() + +/obj/item/weapon/reagent_containers/food/snacks/grown/parsnip + seed = /obj/item/seeds/carrot/parsnip + name = "parsnip" + desc = "Closely related to carrots." + icon_state = "parsnip" + reagents_add = list("vitamin" = 0.05, "nutriment" = 0.05) + bitesize_mod = 2 + + +// White-Beet +/obj/item/seeds/whitebeet + name = "pack of white-beet seeds" + desc = "These seeds grow into sugary beet producing plants." + icon_state = "seed-whitebeet" + species = "whitebeet" + plantname = "White-Beet Plants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet + lifespan = 60 + endurance = 50 + yield = 6 + oneharvest = 1 + mutatelist = list(/obj/item/seeds/redbeet) + /obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet - seed = /obj/item/seeds/whitebeetseed + seed = /obj/item/seeds/whitebeet name = "white-beet" desc = "You can't beat white-beet." icon_state = "whitebeet" @@ -27,16 +75,21 @@ reagents_add = list("vitamin" = 0.04, "sugar" = 0.2, "nutriment" = 0.05) bitesize_mod = 2 -/obj/item/weapon/reagent_containers/food/snacks/grown/parsnip - seed = /obj/item/seeds/parsnipseed - name = "parsnip" - desc = "Closely related to carrots." - icon_state = "parsnip" - reagents_add = list("vitamin" = 0.05, "nutriment" = 0.05) - bitesize_mod = 2 +// Red Beet +/obj/item/seeds/redbeet + name = "pack of redbeet seeds" + desc = "These seeds grow into red beet producing plants." + icon_state = "seed-redbeet" + species = "redbeet" + plantname = "Red-Beet Plants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/redbeet + lifespan = 60 + endurance = 50 + yield = 6 + oneharvest = 1 /obj/item/weapon/reagent_containers/food/snacks/grown/redbeet - seed = /obj/item/seeds/redbeetseed + seed = /obj/item/seeds/redbeet name = "red beet" desc = "You can't beat red beet." icon_state = "redbeet" diff --git a/code/modules/hydroponics/grown/tea_coffee.dm b/code/modules/hydroponics/grown/tea_coffee.dm index f015fdc671c..76d89fc4763 100644 --- a/code/modules/hydroponics/grown/tea_coffee.dm +++ b/code/modules/hydroponics/grown/tea_coffee.dm @@ -1,21 +1,62 @@ +// Tea +/obj/item/seeds/tea + name = "pack of tea aspera seeds" + desc = "These seeds grow into tea plants." + icon_state = "seed-teaaspera" + species = "teaaspera" + plantname = "Tea Aspera Plant" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/tea + lifespan = 20 + maturation = 5 + production = 5 + yield = 5 + growthstages = 5 + mutatelist = list(/obj/item/seeds/tea/astra) + /obj/item/weapon/reagent_containers/food/snacks/grown/tea - seed = /obj/item/seeds/tea_aspera_seed + seed = /obj/item/seeds/tea name = "Tea Aspera tips" desc = "These aromatic tips of the tea plant can be dried to make tea." icon_state = "tea_aspera_leaves" filling_color = "#008000" reagents_add = list("vitamin" = 0.04, "teapowder" = 0.1) +// Tea Astra +/obj/item/seeds/tea/astra + name = "pack of tea astra seeds" + icon_state = "seed-teaastra" + species = "teaastra" + plantname = "Tea Astra Plant" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/tea/astra + mutatelist = list() + rarity = 20 + /obj/item/weapon/reagent_containers/food/snacks/grown/tea/astra - seed = /obj/item/seeds/tea_astra_seed + seed = /obj/item/seeds/tea/astra name = "Tea Astra tips" icon_state = "tea_astra_leaves" filling_color = "#4582B4" reagents_add = list("salglu_solution" = 0.05, "vitamin" = 0.04, "teapowder" = 0.1) +// Coffee +/obj/item/seeds/coffee + name = "pack of coffee arabica seeds" + desc = "These seeds grow into coffee arabica bushes." + icon_state = "seed-coffeea" + species = "coffeea" + plantname = "Coffee Arabica Bush" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/coffee + lifespan = 30 + endurance = 20 + maturation = 5 + production = 5 + yield = 5 + growthstages = 5 + mutatelist = list(/obj/item/seeds/coffee/robusta) + /obj/item/weapon/reagent_containers/food/snacks/grown/coffee - seed = /obj/item/seeds/coffee_arabica_seed + seed = /obj/item/seeds/coffee name = "coffee arabica beans" desc = "Dry them out to make coffee." icon_state = "coffee_arabica" @@ -23,8 +64,19 @@ bitesize_mod = 2 reagents_add = list("vitamin" = 0.04, "coffeepowder" = 0.1) +// Coffee Robusta +/obj/item/seeds/coffee/robusta + name = "pack of coffee robusta seeds" + desc = "These seeds grow into coffee robusta bushes." + icon_state = "seed-coffeer" + species = "coffeer" + plantname = "Coffee Robusta Bush" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta + mutatelist = list() + rarity = 20 + /obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta - seed = /obj/item/seeds/coffee_robusta_seed + seed = /obj/item/seeds/coffee/robusta name = "coffee robusta beans" icon_state = "coffee_robusta" reagents_add = list("morphine" = 0.05, "vitamin" = 0.04, "coffeepowder" = 0.1) \ No newline at end of file diff --git a/code/modules/hydroponics/grown/tobacco.dm b/code/modules/hydroponics/grown/tobacco.dm index e5c8c8af071..0ebebdebede 100644 --- a/code/modules/hydroponics/grown/tobacco.dm +++ b/code/modules/hydroponics/grown/tobacco.dm @@ -1,14 +1,40 @@ +// Tobacco +/obj/item/seeds/tobacco + name = "pack of tobacco seeds" + desc = "These seeds grow into tobacco plants." + icon_state = "seed-tobacco" + species = "tobacco" + plantname = "Tobacco Plant" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/tobacco + lifespan = 20 + maturation = 5 + production = 5 + oneharvest = 1 + yield = 10 + growthstages = 3 + mutatelist = list(/obj/item/seeds/tobacco/space) + /obj/item/weapon/reagent_containers/food/snacks/grown/tobacco - seed = /obj/item/seeds/tobacco_seed + seed = /obj/item/seeds/tobacco name = "tobacco leaves" desc = "Dry them out to make some smokes." icon_state = "tobacco_leaves" filling_color = "#008000" reagents_add = list("nicotine" = 0.03, "nutriment" = 0.03) +// Space Tobacco +/obj/item/seeds/tobacco/space + name = "pack of space tobacco seeds" + desc = "These seeds grow into space tobacco plants." + icon_state = "seed-stobacco" + species = "stobacco" + plantname = "Space Tobacco Plant" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/tobacco/space + mutatelist = list() + rarity = 20 /obj/item/weapon/reagent_containers/food/snacks/grown/tobacco/space - seed = /obj/item/seeds/tobacco_space_seed + seed = /obj/item/seeds/tobacco/space name = "space tobacco leaves" desc = "Dry them out to make some space-smokes." icon_state = "stobacco_leaves" diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm index 887c268fc67..3fb52d7d969 100644 --- a/code/modules/hydroponics/grown/tomato.dm +++ b/code/modules/hydroponics/grown/tomato.dm @@ -1,17 +1,28 @@ // Tomato +/obj/item/seeds/tomato + name = "pack of tomato seeds" + desc = "These seeds grow into tomato plants." + icon_state = "seed-tomato" + species = "tomato" + plantname = "Tomato Plants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/tomato + maturation = 8 + mutatelist = list(/obj/item/seeds/tomato/blue, /obj/item/seeds/tomato/blood, /obj/item/seeds/tomato/killer) + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato - seed = /obj/item/seeds/tomatoseed + seed = /obj/item/seeds/tomato name = "tomato" desc = "I say to-mah-to, you say tom-mae-to." icon_state = "tomato" - var/splat = /obj/effect/decal/cleanable/tomato_smudge + var/splat_type = /obj/effect/decal/cleanable/tomato_smudge filling_color = "#FF6347" reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1) bitesize_mod = 2 /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/proc/squish(atom/target) var/turf/T = get_turf(target) - new splat(T) + if(splat_type) + new splat_type(T) visible_message("The [src.name] has been squashed.","You hear a smack.") for(var/atom/A in get_turf(target)) reagents.reaction(A) @@ -23,26 +34,44 @@ // Blood Tomato +/obj/item/seeds/tomato/blood + name = "pack of blood-tomato seeds" + desc = "These seeds grow into blood-tomato plants." + icon_state = "seed-bloodtomato" + species = "bloodtomato" + plantname = "Blood-Tomato Plants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood + mutatelist = list() + rarity = 20 + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood - seed = /obj/item/seeds/bloodtomatoseed + seed = /obj/item/seeds/tomato/blood name = "blood-tomato" desc = "So bloody...so...very...bloody....AHHHH!!!!" icon_state = "bloodtomato" - splat = /obj/effect/gibspawner/generic + splat_type = /obj/effect/gibspawner/generic filling_color = "#FF0000" - -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood/add_juice(loc, potency = 10) - ..() - reagents.add_reagent("blood", 1 + round(potency / 5), list("blood_type"="O-")) + reagents_add = list("blood" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1) // Blue Tomato +/obj/item/seeds/tomato/blue + name = "pack of blue-tomato seeds" + desc = "These seeds grow into blue-tomato plants." + icon_state = "seed-bluetomato" + species = "bluetomato" + plantname = "Blue-Tomato Plants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue + yield = 2 + mutatelist = list(/obj/item/seeds/tomato/blue/bluespace) + rarity = 20 + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue - seed = /obj/item/seeds/bluetomatoseed + seed = /obj/item/seeds/tomato/blue name = "blue-tomato" desc = "I say blue-mah-to, you say blue-mae-to." icon_state = "bluetomato" - splat = /obj/effect/decal/cleanable/oil + splat_type = /obj/effect/decal/cleanable/oil filling_color = "#0000FF" reagents_add = list("lube" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1) @@ -55,8 +84,19 @@ // Bluespace Tomato +/obj/item/seeds/tomato/blue/bluespace + name = "pack of blue-space tomato seeds" + desc = "These seeds grow into blue-space tomato plants." + icon_state = "seed-bluespacetomato" + species = "bluespacetomato" + plantname = "Blue-Space Tomato Plants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace + yield = 2 + mutatelist = list() + rarity = 50 + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace - seed = /obj/item/seeds/bluespacetomatoseed + seed = /obj/item/seeds/tomato/blue/bluespace name = "blue-space tomato" desc = "So lubricated, you might slip through space-time." icon_state = "bluespacetomato" @@ -79,8 +119,21 @@ // Killer Tomato +/obj/item/seeds/tomato/killer + name = "pack of killer-tomato seeds" + desc = "These seeds grow into killer-tomato plants." + icon_state = "seed-killertomato" + species = "killertomato" + plantname = "Killer-Tomato Plants" + product = /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/killer + yield = 2 + oneharvest = 1 + growthstages = 2 + mutatelist = list() + rarity = 30 + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/killer - seed = /obj/item/seeds/killertomatoseed + seed = /obj/item/seeds/tomato/killer name = "killer-tomato" desc = "I say to-mah-to, you say tom-mae-to... OH GOD IT'S EATING MY LEGS!!" icon_state = "killertomato" diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm new file mode 100644 index 00000000000..3e2a863b5b7 --- /dev/null +++ b/code/modules/hydroponics/grown/towercap.dm @@ -0,0 +1,92 @@ +/obj/item/seeds/tower + name = "pack of tower-cap mycelium" + desc = "This mycelium grows into tower-cap mushrooms." + icon_state = "mycelium-tower" + species = "towercap" + plantname = "Tower Caps" + product = /obj/item/weapon/grown/log + lifespan = 80 + endurance = 50 + maturation = 15 + production = 1 + yield = 5 + potency = 50 + oneharvest = 1 + growthstages = 3 + plant_type = 2 + mutatelist = list(/obj/item/seeds/tower/steel) + +/obj/item/seeds/tower/steel + name = "pack of steel-cap mycelium" + desc = "This mycelium grows into steel logs." + icon_state = "mycelium-steelcap" + species = "steelcap" + plantname = "Steel Caps" + product = /obj/item/weapon/grown/log/steel + mutatelist = list() + rarity = 20 + + + + +/obj/item/weapon/grown/log + seed = /obj/item/seeds/tower + name = "tower-cap log" + desc = "It's better than bad, it's good!" + icon_state = "logs" + force = 5 + throwforce = 5 + w_class = 3 + throw_speed = 2 + throw_range = 3 + plant_type = 2 + origin_tech = "materials=1" + attack_verb = list("bashed", "battered", "bludgeoned", "whacked") + var/plank_type = /obj/item/stack/sheet/mineral/wood + var/plank_name = "wooden planks" + var/list/accepted = list(/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco, + /obj/item/weapon/reagent_containers/food/snacks/grown/tea, + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris, + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus, + /obj/item/weapon/reagent_containers/food/snacks/grown/wheat) + + +/obj/item/weapon/grown/log/attackby(obj/item/weapon/W, mob/user, params) + ..() + if(W.sharpness) + user.show_message("You make [plank_name] out of \the [src]!", 1) + var/obj/item/stack/plank = new plank_type(user.loc, 1 + round(potency / 25)) + var/old_plank_amount = plank.amount + for(var/obj/item/stack/ST in user.loc) + if(ST != plank && istype(ST, plank_type) && ST.amount < ST.max_amount) + ST.attackby(plank, user) //we try to transfer all old unfinished stacks to the new stack we created. + if(plank.amount > old_plank_amount) + user << "You add the newly-formed [plank_name] to the stack. It now contains [plank.amount] [plank_name]." + qdel(src) + + if(is_type_in_list(W,accepted)) + var/obj/item/weapon/reagent_containers/food/snacks/grown/leaf = W + if(leaf.dry) + user.show_message("You wrap \the [W] around the log, turning it into a torch!") + var/obj/item/device/flashlight/flare/torch/T = new /obj/item/device/flashlight/flare/torch(user.loc) + usr.unEquip(W) + usr.put_in_active_hand(T) + qdel(leaf) + qdel(src) + return + else + usr << "You must dry this first!" + +/obj/item/weapon/grown/log/tree + seed = null + name = "wood log" + desc = "TIMMMMM-BERRRRRRRRRRR!" + +/obj/item/weapon/grown/log/steel + seed = /obj/item/seeds/tower/steel + name = "steel-cap log" + desc = "It's made of metal." + icon_state = "steellogs" + accepted = list() + plank_type = /obj/item/stack/rods + plank_name = "rods" \ No newline at end of file diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 725df4dd4ce..ec21706a6e0 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -61,324 +61,4 @@ /obj/item/weapon/grown/proc/add_juice() if(reagents) return 1 - return 0 - -/obj/item/weapon/grown/log - seed = /obj/item/seeds/towermycelium - name = "tower-cap log" - desc = "It's better than bad, it's good!" - icon_state = "logs" - force = 5 - throwforce = 5 - w_class = 3 - throw_speed = 2 - throw_range = 3 - plant_type = 2 - origin_tech = "materials=1" - attack_verb = list("bashed", "battered", "bludgeoned", "whacked") - var/plank_type = /obj/item/stack/sheet/mineral/wood - var/plank_name = "wooden planks" - var/list/accepted = list(/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco, - /obj/item/weapon/reagent_containers/food/snacks/grown/tobacco/space, - /obj/item/weapon/reagent_containers/food/snacks/grown/tea, - /obj/item/weapon/reagent_containers/food/snacks/grown/tea/astra, - /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris, - /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus, - /obj/item/weapon/reagent_containers/food/snacks/grown/wheat) - - -/obj/item/weapon/grown/log/attackby(obj/item/weapon/W, mob/user, params) - ..() - if(W.sharpness) - user.show_message("You make [plank_name] out of \the [src]!", 1) - var/obj/item/stack/plank = new plank_type(user.loc, 1 + round(potency / 25)) - var/old_plank_amount = plank.amount - for(var/obj/item/stack/ST in user.loc) - if(ST != plank && istype(ST, plank_type) && ST.amount < ST.max_amount) - ST.attackby(plank, user) //we try to transfer all old unfinished stacks to the new stack we created. - if(plank.amount > old_plank_amount) - user << "You add the newly-formed [plank_name] to the stack. It now contains [plank.amount] [plank_name]." - qdel(src) - - if(is_type_in_list(W,accepted)) - var/obj/item/weapon/reagent_containers/food/snacks/grown/leaf = W - if(leaf.dry) - user.show_message("You wrap \the [W] around the log, turning it into a torch!") - var/obj/item/device/flashlight/flare/torch/T = new /obj/item/device/flashlight/flare/torch(user.loc) - usr.unEquip(W) - usr.put_in_active_hand(T) - qdel(leaf) - qdel(src) - return - else - usr << "You must dry this first!" - -/obj/item/weapon/grown/log/tree - seed = null - name = "wood log" - desc = "TIMMMMM-BERRRRRRRRRRR!" - -/obj/item/weapon/grown/log/steel - seed = /obj/item/seeds/steelmycelium - name = "steel-cap log" - desc = "It's made of metal." - icon_state = "steellogs" - accepted = list() - plank_type = /obj/item/stack/rods - plank_name = "rods" - -/obj/item/weapon/grown/sunflower // FLOWER POWER! - seed = /obj/item/seeds/sunflowerseed - name = "sunflower" - desc = "It's beautiful! A certain person might beat you to death if you trample these." - icon_state = "sunflower" - damtype = "fire" - force = 0 - slot_flags = SLOT_HEAD - throwforce = 0 - w_class = 1 - throw_speed = 1 - throw_range = 3 - -/obj/item/weapon/grown/sunflower/attack(mob/M, mob/user) - M << " [user] smacks you with a sunflower!FLOWER POWER" - user << "Your sunflower's FLOWER POWERstrikes [M]" - - -/obj/item/weapon/grown/novaflower - seed = /obj/item/seeds/novaflowerseed - name = "novaflower" - desc = "These beautiful flowers have a crisp smokey scent, like a summer bonfire." - icon_state = "novaflower" - damtype = "fire" - force = 0 - slot_flags = SLOT_HEAD - throwforce = 0 - w_class = 1 - throw_speed = 1 - throw_range = 3 - plant_type = 0 - attack_verb = list("roasted", "scorched", "burned") - -/obj/item/weapon/grown/novaflower/add_juice() - if(..()) - reagents.add_reagent("nutriment", 1) - reagents.add_reagent("capsaicin", round((potency / 3.5), 1)) - reagents.add_reagent("condensedcapsaicin", round((potency / 4), 1)) - force = round((5 + potency / 5), 1) - -/obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M, mob/user) - if(!..()) return - if(istype(M, /mob/living)) - M << "You are lit on fire from the intense heat of the [name]!" - M.adjust_fire_stacks(potency / 20) - M.IgniteMob() - -/obj/item/weapon/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity) - if(!proximity) return - if(endurance > 0) - endurance -= rand(1, (endurance / 3) + 1) - else - usr << "All the petals have fallen off the [name] from violent whacking!" - usr.unEquip(src) - qdel(src) - -/obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user) - ..() - if(!user.gloves) - user << "The [name] burns your bare hand!" - user.adjustFireLoss(rand(1, 5)) - - -/obj/item/weapon/grown/nettle //abstract type - name = "nettle" - desc = "It's probably not wise to touch it with bare hands..." - icon = 'icons/obj/weapons.dmi' - icon_state = "nettle" - damtype = "fire" - force = 15 - hitsound = 'sound/weapons/bladeslice.ogg' - throwforce = 5 - w_class = 1 - throw_speed = 1 - throw_range = 3 - plant_type = 1 - origin_tech = "combat=1" - attack_verb = list("stung") - -/obj/item/weapon/grown/nettle/suicide_act(mob/user) - user.visible_message("[user] is eating some of the [src.name]! It looks like \he's trying to commit suicide.") - return (BRUTELOSS|TOXLOSS) - -/obj/item/weapon/grown/nettle/pickup(mob/living/user) - ..() - if(!iscarbon(user)) - return 0 - var/mob/living/carbon/C = user - if(ishuman(user)) - var/mob/living/carbon/human/H = C - if(H.gloves) - return 0 - var/organ = ((H.hand ? "l_":"r_") + "arm") - var/obj/item/organ/limb/affecting = H.get_organ(organ) - if(affecting.take_damage(0, force)) - H.update_damage_overlays(0) - else - C.take_organ_damage(0,force) - C << "The nettle burns your bare hand!" - return 1 - -/obj/item/weapon/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity) - if(!proximity) return - if(force > 0) - force -= rand(1, (force / 3) + 1) // When you whack someone with it, leaves fall off - else - usr << "All the leaves have fallen off the nettle from violent whacking." - usr.unEquip(src) - qdel(src) - - -/obj/item/weapon/grown/nettle/basic - seed = /obj/item/seeds/nettleseed - -/obj/item/weapon/grown/nettle/basic/add_juice() - ..() - reagents.add_reagent("sacid", round((potency / 2), 1)) - force = round((5 + potency / 5), 1) - - -/obj/item/weapon/grown/nettle/death - seed = /obj/item/seeds/deathnettleseed - name = "deathnettle" - desc = "The glowing nettle incites rage in you just from looking at it!" - icon_state = "deathnettle" - force = 30 - throwforce = 15 - origin_tech = "combat=3" - -/obj/item/weapon/grown/nettle/death/add_juice() - ..() - reagents.add_reagent("facid", round((potency / 2), 1)) - force = round((5 + potency / 2.5), 1) - -/obj/item/weapon/grown/nettle/death/pickup(mob/living/carbon/user) - ..() - if(..()) - if(prob(50)) - user.Paralyse(5) - user << "You are stunned by the Deathnettle when you try picking it up!" - -/obj/item/weapon/grown/nettle/death/attack(mob/living/carbon/M, mob/user) - if(!..()) return - if(istype(M, /mob/living)) - M << "You are stunned by the powerful acid of the Deathnettle!" - add_logs(user, M, "attacked", src) - - M.adjust_blurriness(force/7) - if(prob(20)) - M.Paralyse(force / 6) - M.Weaken(force / 15) - M.drop_item() - - -/obj/item/weapon/grown/bananapeel - name = "banana peel" - desc = "A peel from a banana." - icon = 'icons/obj/items.dmi' - icon_state = "banana_peel" - item_state = "banana_peel" - w_class = 1 - throwforce = 0 - throw_speed = 3 - throw_range = 7 - -/obj/item/weapon/grown/bananapeel/suicide_act(mob/user) - user.visible_message("[user] is deliberately slipping on the [src.name]! It looks like \he's trying to commit suicide.") - playsound(loc, 'sound/misc/slip.ogg', 50, 1, -1) - return (BRUTELOSS) - -/obj/item/weapon/grown/bananapeel/Crossed(AM as mob|obj) - if (istype(AM, /mob/living/carbon)) - var/mob/living/carbon/M = AM - var/stun = Clamp(potency / 10, 1, 10) - var/weaken = Clamp(potency / 20, 0.5, 5) - M.slip(stun, weaken, src) - return 1 - -/obj/item/weapon/grown/bananapeel/bluespace - name = "bluespace banana peel" - desc = "A peel from a bluespace banana." - icon = 'icons/obj/hydroponics/harvest.dmi' - icon_state = "banana_peel_blue" - origin_tech = "bluespace=3" - -/obj/item/weapon/grown/bananapeel/bluespace/Crossed(AM) - if(..()) - var/teleport_radius = potency / 10 - do_teleport(AM, get_turf(AM), teleport_radius) - AM << "You slip through spacetime!" - if(prob(50)) - do_teleport(src, get_turf(src), teleport_radius) - else - qdel(src) - -/obj/item/weapon/grown/bananapeel/specialpeel //used by /obj/item/clothing/shoes/clown_shoes/banana_shoes - name = "synthesized banana peel" - desc = "A synthetic banana peel." - -/obj/item/weapon/grown/bananapeel/specialpeel/Crossed(AM) - if(..()) - qdel(src) - -/obj/item/weapon/grown/bananapeel/mimanapeel - name = "mimana peel" - desc = "A mimana peel." - icon = 'icons/obj/hydroponics/harvest.dmi' - icon_state = "mimana_peel" - - -/obj/item/weapon/grown/corncob - name = "corn cob" - desc = "A reminder of meals gone by." - icon_state = "corncob" - item_state = "corncob" - w_class = 1 - throwforce = 0 - throw_speed = 3 - throw_range = 7 - -/obj/item/weapon/grown/corncob/attackby(obj/item/weapon/grown/W, mob/user, params) - ..() - if(W.is_sharp()) - user << "You use [W] to fashion a pipe out of the corn cob!" - new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc) - user.unEquip(src) - qdel(src) - return - -/obj/item/weapon/grown/snapcorn - seed = /obj/item/seeds/snapcornseed - name = "snap corn" - desc = "A cob with snap pops" - icon_state = "snapcorn" - item_state = "corncob" - w_class = 1 - throwforce = 0 - throw_speed = 3 - throw_range = 7 - var/snap_pops = 1 - -/obj/item/weapon/grown/snapcorn/add_juice() - ..() - snap_pops = max(round(potency/8), 1) - -/obj/item/weapon/grown/snapcorn/attack_self(mob/user) - ..() - user << "You pick up a snap pops from the cob." - var/obj/item/toy/snappop/S = new /obj/item/toy/snappop(user.loc) - if(ishuman(user)) - user.put_in_hands(S) - snap_pops -= 1 - if(!snap_pops) - new /obj/item/weapon/grown/corncob(user.loc) - qdel(src) + return 0 \ No newline at end of file diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 1ccab8f833b..f648d636395 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -315,19 +315,19 @@ oldPlantName = "Empty tray" switch(rand(1,18)) // randomly pick predominative weed if(16 to 18) - myseed = new /obj/item/seeds/reishimycelium + myseed = new /obj/item/seeds/reishi if(14 to 15) - myseed = new /obj/item/seeds/nettleseed + myseed = new /obj/item/seeds/nettle if(12 to 13) myseed = new /obj/item/seeds/harebell if(10 to 11) - myseed = new /obj/item/seeds/amanitamycelium + myseed = new /obj/item/seeds/amanita if(8 to 9) - myseed = new /obj/item/seeds/chantermycelium + myseed = new /obj/item/seeds/chanter if(6 to 7) - myseed = new /obj/item/seeds/towermycelium + myseed = new /obj/item/seeds/tower if(4 to 5) - myseed = new /obj/item/seeds/plumpmycelium + myseed = new /obj/item/seeds/plump else myseed = new /obj/item/seeds/weeds planted = 1 @@ -386,7 +386,7 @@ if( weedlevel > 5 ) if(myseed) qdel(myseed) - var/newWeed = pick(/obj/item/seeds/libertymycelium, /obj/item/seeds/angelmycelium, /obj/item/seeds/deathnettleseed, /obj/item/seeds/kudzuseed) + var/newWeed = pick(/obj/item/seeds/liberty, /obj/item/seeds/angel, /obj/item/seeds/nettle/death, /obj/item/seeds/kudzu) myseed = new newWeed dead = 0 hardmutate() @@ -510,7 +510,8 @@ adjustWater(-round(S.get_reagent_amount("chlorine") * 0.5)) adjustWeeds(-rand(1,3)) - // White Phosphorous + water -> phosphoric acid. That's not a good thing really. Phosphoric salts are beneficial though. And even if the plant suffers, in the long run the tray gets some nutrients. The benefit isn't worth that much. + // White Phosphorous + water -> phosphoric acid. That's not a good thing really. + // Phosphoric salts are beneficial though. And even if the plant suffers, in the long run the tray gets some nutrients. The benefit isn't worth that much. if(S.has_reagent("phosphorus", 1)) adjustHealth(-round(S.get_reagent_amount("phosphorus") * 0.75)) adjustNutri(round(S.get_reagent_amount("phosphorus") * 0.1)) @@ -532,7 +533,8 @@ adjustWater(round(S.get_reagent_amount("holywater") * 1)) adjustHealth(round(S.get_reagent_amount("holywater") * 0.1)) - // A variety of nutrients are dissolved in club soda, without sugar. These nutrients include carbon, oxygen, hydrogen, phosphorous, potassium, sulfur and sodium, all of which are needed for healthy plant growth. + // A variety of nutrients are dissolved in club soda, without sugar. + // These nutrients include carbon, oxygen, hydrogen, phosphorous, potassium, sulfur and sodium, all of which are needed for healthy plant growth. if(S.has_reagent("sodawater", 1)) adjustWater(round(S.get_reagent_amount("sodawater") * 1)) adjustHealth(round(S.get_reagent_amount("sodawater") * 0.1)) @@ -712,7 +714,7 @@ else if(istype(O, /obj/item/seeds/)) if(!planted) - if(/obj/item/seeds/kudzuseed) + if(/obj/item/seeds/kudzu) investigate_log("had Kudzu planted in it by [user.ckey]([user]) at ([x],[y],[z])","kudzu") user.unEquip(O) user << "You plant [O]." @@ -1060,4 +1062,4 @@ ..() if(istype(O, /obj/item/weapon/shovel)) user << "You clear up [src]!" - qdel(src) + qdel(src) \ No newline at end of file diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 66867d27ef3..ebdd83109bd 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -3,25 +3,24 @@ // ******************************************************** /obj/item/seeds - name = "A pack of seeds." icon = 'icons/obj/hydroponics/seeds.dmi' - icon_state = "seed" //Unknown plant seed - these shouldn't exist in-game. - w_class = 1 //Pocketable. + icon_state = "seed" // Unknown plant seed - these shouldn't exist in-game. + w_class = 1 // Pocketable. burn_state = FLAMMABLE - var/plantname = "Plants" //Name of plant when planted. - var/product //A type path. The thing that is created when the plant is harvested. - var/species = "" //Used to update icons. Should match the name in the sprites. - var/lifespan = 0 //How long before the plant begins to take damage from age. - var/endurance = 0 //Amount of health the plant has. - var/maturation = 0 //Used to determine which sprite to switch to when growing. - var/production = 0 //Changes the amount of time needed for a plant to become harvestable. - var/yield = 0 //Amount of growns created per harvest. If is -1, the plant/shroom/weed is never meant to be harvested. - var/oneharvest = 0 //If a plant is cleared from the tray after harvesting, e.g. a carrot. - var/potency = -1 //The 'power' of a plant. Generally effects the amount of reagent in a plant, also used in other ways. - var/growthstages = 0 //Amount of growth sprites the plant has. - var/plant_type = 0 //0 = 'normal plant'; 1 = weed; 2 = shroom - var/rarity = 0 //How rare the plant is. Used for giving points to cargo when shipping off to Centcom. - var/list/mutatelist = list() //The type of plants that this plant can mutate into. + var/plantname = "Plants" // Name of plant when planted. + var/product // A type path. The thing that is created when the plant is harvested. + var/species = "" // Used to update icons. Should match the name in the sprites. + var/lifespan = 25 // How long before the plant begins to take damage from age. + var/endurance = 15 // Amount of health the plant has. + var/maturation = 6 // Used to determine which sprite to switch to when growing. + var/production = 6 // Changes the amount of time needed for a plant to become harvestable. + var/yield = 3 // Amount of growns created per harvest. If is -1, the plant/shroom/weed is never meant to be harvested. + var/oneharvest = 0 // If a plant is cleared from the tray after harvesting, e.g. a carrot. + var/potency = 10 // The 'power' of a plant. Generally effects the amount of reagent in a plant, also used in other ways. + var/growthstages = 6 // Amount of growth sprites the plant has. + var/plant_type = 0 // 0 = 'normal plant'; 1 = weed; 2 = shroom + var/rarity = 0 // How rare the plant is. Used for giving points to cargo when shipping off to Centcom. + var/list/mutatelist = list() // The type of plants that this plant can mutate into. /obj/item/seeds/New(loc, parent) ..() @@ -50,1536 +49,4 @@ for(var/string in text_strings) user << string return - ..() // Fallthrough to item/attackby() so that bags can pick seeds up - -/obj/item/seeds/chiliseed - name = "pack of chili seeds" - desc = "These seeds grow into chili plants. HOT! HOT! HOT!" - icon_state = "seed-chili" - species = "chili" - plantname = "Chili Plants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/chili - lifespan = 20 - endurance = 15 - maturation = 5 - production = 5 - yield = 4 - potency = 20 - plant_type = 0 - growthstages = 6 - rarity = 0 // CentComm knows about this species already, it's in exotic seeds crates. - mutatelist = list(/obj/item/seeds/icepepperseed, /obj/item/seeds/chilighost) - -/obj/item/seeds/replicapod - name = "pack of replica pod seeds" - desc = "These seeds grow into replica pods. They say these are used to harvest humans." - icon_state = "seed-replicapod" - species = "replicapod" - plantname = "Replica Pod" - product = /mob/living/carbon/human //verrry special -- Urist - lifespan = 50 - endurance = 8 - maturation = 10 - production = 1 - yield = 1 //seeds if there isn't a dna inside - oneharvest = 1 - potency = 30 - plant_type = 0 - growthstages = 6 - var/ckey = null - var/realName = null - var/datum/mind/mind = null - var/blood_gender = null - var/blood_type = null - var/list/features = null - var/factions = null - var/contains_sample = 0 - -/obj/item/seeds/replicapod/attackby(obj/item/weapon/W, mob/user, params) - if(istype(W,/obj/item/weapon/reagent_containers/syringe)) - if(!contains_sample) - for(var/datum/reagent/blood/bloodSample in W.reagents.reagent_list) - if(bloodSample.data["mind"] && bloodSample.data["cloneable"] == 1) - mind = bloodSample.data["mind"] - ckey = bloodSample.data["ckey"] - realName = bloodSample.data["real_name"] - blood_gender = bloodSample.data["gender"] - blood_type = bloodSample.data["blood_type"] - features = bloodSample.data["features"] - factions = bloodSample.data["factions"] - W.reagents.clear_reagents() - user << "You inject the contents of the syringe into the seeds." - contains_sample = 1 - else - user << "The seeds reject the sample!" - else - user << "The seeds already contain a genetic sample!" - ..() - - -/obj/item/seeds/grapeseed - name = "pack of grape seeds" - desc = "These seeds grow into grape vines." - icon_state = "seed-grapes" - species = "grape" - plantname = "Grape Vine" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/grapes - lifespan = 50 - endurance = 25 - maturation = 3 - production = 5 - yield = 4 - potency = 10 - plant_type = 0 - growthstages = 2 - mutatelist = list(/obj/item/seeds/greengrapeseed) - -/obj/item/seeds/greengrapeseed - name = "pack of green grape seeds" - desc = "These seeds grow into green-grape vines." - icon_state = "seed-greengrapes" - species = "greengrape" - plantname = "Green-Grape Vine" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/grapes/green - lifespan = 50 - endurance = 25 - maturation = 3 - production = 5 - yield = 4 - potency = 10 - plant_type = 0 - growthstages = 2 - rarity = 0 // Technically it's a beneficial mutant, but it's not exactly "new"... - -/obj/item/seeds/cabbageseed - name = "pack of cabbage seeds" - desc = "These seeds grow into cabbages." - icon_state = "seed-cabbage" - species = "cabbage" - plantname = "Cabbages" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage - lifespan = 50 - endurance = 25 - maturation = 3 - production = 5 - yield = 4 - potency = 10 - plant_type = 0 - growthstages = 1 - mutatelist = list(/obj/item/seeds/replicapod) - -/obj/item/seeds/berryseed - name = "pack of berry seeds" - desc = "These seeds grow into berry bushes." - icon_state = "seed-berry" - species = "berry" - plantname = "Berry Bush" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/berries - lifespan = 20 - endurance = 15 - maturation = 5 - production = 5 - yield = 2 - potency = 10 - plant_type = 0 - growthstages = 6 - mutatelist = list(/obj/item/seeds/glowberryseed,/obj/item/seeds/poisonberryseed) - -/obj/item/seeds/glowberryseed - name = "pack of glow-berry seeds" - desc = "These seeds grow into glow-berry bushes." - icon_state = "seed-glowberry" - species = "glowberry" - plantname = "Glow-Berry Bush" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow - lifespan = 30 - endurance = 25 - maturation = 5 - production = 5 - yield = 2 - potency = 10 - plant_type = 0 - growthstages = 6 - rarity = 20 - -/obj/item/seeds/bananaseed - name = "pack of banana seeds" - desc = "They're seeds that grow into banana trees. When grown, keep away from clown." - icon_state = "seed-banana" - species = "banana" - plantname = "Banana Tree" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/banana - lifespan = 50 - endurance = 30 - maturation = 6 - production = 6 - yield = 3 - potency = 10 - plant_type = 0 - growthstages = 6 - mutatelist = list(/obj/item/seeds/mimanaseed, /obj/item/seeds/bluespacebananaseed) - -/obj/item/seeds/bluespacebananaseed - name = "pack of bluespace banana seeds" - desc = "They're seeds that grow into bluespace banana trees. When grown, keep away from clown." - icon_state = "seed-banana-blue" - species = "bluespacebanana" - plantname = "Bluespace Banana Tree" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/banana/bluespace - lifespan = 50 - endurance = 30 - maturation = 6 - production = 6 - yield = 3 - potency = 10 - plant_type = 0 - growthstages = 6 - -/obj/item/seeds/mimanaseed - name = "pack of mimana seeds" - desc = "They're seeds that grow into mimana trees. When grown, keep away from mime." - icon_state = "seed-mimana" - species = "mimana" - plantname = "Mimana Tree" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/banana/mime - lifespan = 50 - endurance = 30 - maturation = 6 - production = 6 - yield = 3 - potency = 10 - plant_type = 0 - growthstages = 6 - rarity = 10 - -/obj/item/seeds/eggplantseed - name = "pack of eggplant seeds" - desc = "These seeds grow to produce berries that look nothing like eggs." - icon_state = "seed-eggplant" - species = "eggplant" - plantname = "Eggplants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant - lifespan = 25 - endurance = 15 - maturation = 6 - production = 6 - yield = 2 - potency = 20 - plant_type = 0 - growthstages = 6 - mutatelist = list(/obj/item/seeds/eggyseed) - -/obj/item/seeds/eggyseed - name = "pack of eggplant seeds" - desc = "These seeds grow to produce berries that look a lot like eggs." - icon_state = "seed-eggy" - species = "eggy" - plantname = "Eggplants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy - lifespan = 75 - endurance = 15 - maturation = 6 - production = 12 - yield = 2 - plant_type = 0 - growthstages = 6 - rarity = 0 // CentComm ships these to us in the exotic seeds crate. - -/obj/item/seeds/bloodtomatoseed - name = "pack of blood-tomato seeds" - desc = "These seeds grow into blood-tomato plants." - icon_state = "seed-bloodtomato" - species = "bloodtomato" - plantname = "Blood-Tomato Plants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood - lifespan = 25 - endurance = 20 - maturation = 8 - production = 6 - yield = 3 - potency = 10 - plant_type = 0 - growthstages = 6 - rarity = 20 - -/obj/item/seeds/tomatoseed - name = "pack of tomato seeds" - desc = "These seeds grow into tomato plants." - icon_state = "seed-tomato" - species = "tomato" - plantname = "Tomato Plants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/tomato - lifespan = 25 - endurance = 15 - maturation = 8 - production = 6 - yield = 3 - potency = 10 - plant_type = 0 - growthstages = 6 - mutatelist = list(/obj/item/seeds/bluetomatoseed, /obj/item/seeds/bloodtomatoseed, /obj/item/seeds/killertomatoseed) - -/obj/item/seeds/killertomatoseed - name = "pack of killer-tomato seeds" - desc = "These seeds grow into killer-tomato plants." - icon_state = "seed-killertomato" - species = "killertomato" - plantname = "Killer-Tomato Plants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/killer - lifespan = 25 - endurance = 15 - maturation = 8 - production = 6 - yield = 2 - potency = 10 - plant_type = 0 - oneharvest = 1 - growthstages = 2 - rarity = 30 - -/obj/item/seeds/bluetomatoseed - name = "pack of blue-tomato seeds" - desc = "These seeds grow into blue-tomato plants." - icon_state = "seed-bluetomato" - species = "bluetomato" - plantname = "Blue-Tomato Plants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue - lifespan = 25 - endurance = 15 - maturation = 8 - production = 6 - yield = 2 - potency = 10 - plant_type = 0 - growthstages = 6 - mutatelist = list(/obj/item/seeds/bluespacetomatoseed) - rarity = 20 - -/obj/item/seeds/bluespacetomatoseed - name = "pack of blue-space tomato seeds" - desc = "These seeds grow into blue-space tomato plants." - icon_state = "seed-bluespacetomato" - species = "bluespacetomato" - plantname = "Blue-Space Tomato Plants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace - lifespan = 25 - endurance = 15 - maturation = 8 - production = 6 - yield = 2 - potency = 10 - plant_type = 0 - growthstages = 6 - rarity = 50 - -/obj/item/seeds/cornseed - name = "pack of corn seeds" - desc = "I don't mean to sound corny..." - icon_state = "seed-corn" - species = "corn" - plantname = "Corn Stalks" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/corn - lifespan = 25 - endurance = 15 - maturation = 8 - production = 6 - yield = 3 - plant_type = 0 - oneharvest = 1 - potency = 20 - growthstages = 3 - mutatelist = list(/obj/item/seeds/snapcornseed) - -/obj/item/seeds/snapcornseed - name = "pack of snapcorn seeds" - desc = "Oh snap!" - icon_state = "seed-snapcorn" - species = "snapcorn" - plantname = "Snapcorn Stalks" - product = /obj/item/weapon/grown/snapcorn - lifespan = 25 - endurance = 15 - maturation = 8 - production = 6 - yield = 3 - plant_type = 0 - oneharvest = 1 - potency = 20 - growthstages = 3 - rarity = 10 - -/obj/item/seeds/poppyseed - name = "pack of poppy seeds" - desc = "These seeds grow into poppies." - icon_state = "seed-poppy" - species = "poppy" - plantname = "Poppy Plants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/poppy - lifespan = 25 - endurance = 10 - maturation = 8 - production = 6 - yield = 6 - potency = 20 - plant_type = 0 - oneharvest = 1 - growthstages = 3 - mutatelist = list(/obj/item/seeds/geraniumseed, /obj/item/seeds/lilyseed) - -/obj/item/seeds/geraniumseed - name = "pack of geranium seeds" - desc = "These seeds grow into geranium." - icon_state = "seed-geranium" - species = "geranium" - plantname = "geranium Plants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/geranium - lifespan = 25 - endurance = 10 - maturation = 8 - production = 6 - yield = 6 - potency = 20 - plant_type = 0 - oneharvest = 1 - growthstages = 3 - -/obj/item/seeds/lilyseed - name = "pack of lily seeds" - desc = "These seeds grow into lilies." - icon_state = "seed-lily" - species = "lily" - plantname = "Lily Plants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/lily - lifespan = 25 - endurance = 10 - maturation = 8 - production = 6 - yield = 6 - potency = 20 - plant_type = 0 - oneharvest = 1 - growthstages = 3 - -/obj/item/seeds/potatoseed - name = "pack of potato seeds" - desc = "Boil 'em! Mash 'em! Stick 'em in a stew!" - icon_state = "seed-potato" - species = "potato" - plantname = "Potato Plants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/potato - lifespan = 30 - endurance = 15 - maturation = 10 - production = 1 - yield = 4 - plant_type = 0 - oneharvest = 1 - potency = 10 - growthstages = 4 - mutatelist = list(/obj/item/seeds/sweetpotatoseed) - -/obj/item/seeds/sweetpotatoseed - name = "pack of sweet potato seeds" - desc = "These seeds grow into sweet potato plants" - icon_state = "seed-sweetpotato" - species = "sweetpotato" - plantname = "Sweet Potato Plants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/potato/sweet - lifespan = 30 - endurance = 15 - maturation = 10 - production = 1 - yield = 4 - plant_type = 0 - oneharvest = 1 - potency = 10 - growthstages = 4 - -/obj/item/seeds/icepepperseed - name = "pack of ice pepper seeds" - desc = "These seeds grow into ice pepper plants." - icon_state = "seed-icepepper" - species = "chiliice" - plantname = "Ice Pepper Plants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper - lifespan = 25 - endurance = 15 - maturation = 4 - production = 4 - yield = 4 - potency = 20 - plant_type = 0 - growthstages = 6 - rarity = 20 - -/obj/item/seeds/soyaseed - name = "pack of soybean seeds" - desc = "These seeds grow into soybean plants." - icon_state = "seed-soybean" - species = "soybean" - plantname = "Soybean Plants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans - lifespan = 25 - endurance = 15 - maturation = 4 - production = 4 - yield = 3 - potency = 15 - plant_type = 0 - growthstages = 4 - mutatelist = list(/obj/item/seeds/koiseed) - -/obj/item/seeds/koiseed - name = "pack of koibean seeds" - desc = "These seeds grow into koibean plants." - icon_state = "seed-koibean" - species = "soybean" - plantname = "Koibean Plants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/koibeans - lifespan = 25 - endurance = 15 - maturation = 4 - production = 4 - yield = 3 - potency = 10 - plant_type = 0 - growthstages = 4 - rarity = 20 - -/obj/item/seeds/wheatseed - name = "pack of wheat seeds" - desc = "These may, or may not, grow into wheat." - icon_state = "seed-wheat" - species = "wheat" - plantname = "Wheat Stalks" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/wheat - lifespan = 25 - endurance = 15 - maturation = 6 - production = 1 - yield = 4 - potency = 15 - oneharvest = 1 - plant_type = 0 - growthstages = 6 - mutatelist = list(/obj/item/seeds/oatseed) - -/obj/item/seeds/oatseed - name = "pack of oat seeds" - desc = "These may, or may not, grow into oat." - icon_state = "seed-oat" - species = "oat" - plantname = "Oat Stalks" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/oat - lifespan = 25 - endurance = 15 - maturation = 6 - production = 1 - yield = 4 - potency = 15 - oneharvest = 1 - plant_type = 0 - growthstages = 6 - -/obj/item/seeds/riceseed - name = "pack of rice seeds" - desc = "These may, or may not, grow into rice." - icon_state = "seed-rice" - species = "rice" - plantname = "Rice Stalks" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/rice - lifespan = 25 - endurance = 15 - maturation = 6 - production = 1 - yield = 4 - potency = 15 - oneharvest = 1 - plant_type = 0 - growthstages = 3 - -/obj/item/seeds/carrotseed - name = "pack of carrot seeds" - desc = "These seeds grow into carrots." - icon_state = "seed-carrot" - species = "carrot" - plantname = "Carrots" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/carrot - lifespan = 25 - endurance = 15 - maturation = 10 - production = 1 - yield = 5 - potency = 10 - oneharvest = 1 - plant_type = 0 - growthstages = 3 - mutatelist = list(/obj/item/seeds/parsnipseed) - -/obj/item/seeds/parsnipseed - name = "pack of parsnip seeds" - desc = "These seeds grow into parsnips." - icon_state = "seed-parsnip" - species = "parsnip" - plantname = "Parsnip" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/parsnip - lifespan = 25 - endurance = 15 - maturation = 10 - production = 1 - yield = 5 - potency = 10 - oneharvest = 1 - plant_type = 0 - growthstages = 3 - -/obj/item/seeds/reishimycelium - name = "pack of reishi mycelium" - desc = "This mycelium grows into something medicinal and relaxing." - icon_state = "mycelium-reishi" - species = "reishi" - plantname = "Reishi" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi - lifespan = 35 - endurance = 35 - maturation = 10 - production = 5 - yield = 4 - potency = 15 - oneharvest = 1 - growthstages = 4 - plant_type = 2 - -/obj/item/seeds/amanitamycelium - name = "pack of fly amanita mycelium" - desc = "This mycelium grows into something horrible." - icon_state = "mycelium-amanita" - species = "amanita" - plantname = "Fly Amanitas" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita - lifespan = 50 - endurance = 35 - maturation = 10 - production = 5 - yield = 4 - potency = 10 - oneharvest = 1 - growthstages = 3 - plant_type = 2 - mutatelist = list(/obj/item/seeds/angelmycelium) - -/obj/item/seeds/angelmycelium - name = "pack of destroying angel mycelium" - desc = "This mycelium grows into something devastating." - icon_state = "mycelium-angel" - species = "angel" - plantname = "Destroying Angels" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel - lifespan = 50 - endurance = 35 - maturation = 12 - production = 5 - yield = 2 - potency = 35 - oneharvest = 1 - growthstages = 3 - plant_type = 2 - rarity = 30 - -/obj/item/seeds/libertymycelium - name = "pack of liberty-cap mycelium" - desc = "This mycelium grows into liberty-cap mushrooms." - icon_state = "mycelium-liberty" - species = "liberty" - plantname = "Liberty-Caps" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap - lifespan = 25 - endurance = 15 - maturation = 7 - production = 1 - yield = 5 - potency = 15 - oneharvest = 1 - growthstages = 3 - plant_type = 2 - -/obj/item/seeds/chantermycelium - name = "pack of chanterelle mycelium" - desc = "This mycelium grows into chanterelle mushrooms." - icon_state = "mycelium-chanter" - species = "chanter" - plantname = "Chanterelle Mushrooms" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle - lifespan = 35 - endurance = 20 - maturation = 7 - production = 1 - yield = 5 - potency = 15 - oneharvest = 1 - growthstages = 3 - plant_type = 2 - -/obj/item/seeds/towermycelium - name = "pack of tower-cap mycelium" - desc = "This mycelium grows into tower-cap mushrooms." - icon_state = "mycelium-tower" - species = "towercap" - plantname = "Tower Caps" - product = /obj/item/weapon/grown/log - lifespan = 80 - endurance = 50 - maturation = 15 - production = 1 - yield = 5 - potency = 50 - oneharvest = 1 - growthstages = 3 - plant_type = 2 - mutatelist = list(/obj/item/seeds/steelmycelium) - -/obj/item/seeds/steelmycelium - name = "pack of steel-cap mycelium" - desc = "This mycelium grows into steel logs." - icon_state = "mycelium-steelcap" - species = "steelcap" - plantname = "Steel Caps" - product = /obj/item/weapon/grown/log/steel - lifespan = 80 - endurance = 50 - maturation = 15 - production = 1 - yield = 5 - potency = 50 - oneharvest = 1 - growthstages = 3 - plant_type = 2 - rarity = 20 - -/obj/item/seeds/glowshroom - name = "pack of glowshroom mycelium" - desc = "This mycelium -glows- into mushrooms!" - icon_state = "mycelium-glowshroom" - species = "glowshroom" - plantname = "Glowshrooms" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom - lifespan = 120 //ten times that is the delay - endurance = 30 - maturation = 15 - production = 1 - yield = 3 //-> spread - potency = 30 //-> brightness - oneharvest = 1 - growthstages = 4 - plant_type = 2 - rarity = 20 - mutatelist = list(/obj/item/seeds/glowcap) - -/obj/item/seeds/glowcap - name = "pack of glowcap mycelium" - desc = "This mycelium -powers- into mushrooms!" - icon_state = "mycelium-glowcap" - species = "glowcap" - plantname = "Glowcaps" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap - lifespan = 120 //ten times that is the delay - endurance = 30 - maturation = 15 - production = 1 - yield = 3 //-> spread - potency = 30 //-> brightness - oneharvest = 1 - growthstages = 4 - plant_type = 2 - rarity = 20 - -/obj/item/seeds/plumpmycelium - name = "pack of plump-helmet mycelium" - desc = "This mycelium grows into helmets... maybe." - icon_state = "mycelium-plump" - species = "plump" - plantname = "Plump-Helmet Mushrooms" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet - lifespan = 25 - endurance = 15 - maturation = 8 - production = 1 - yield = 4 - potency = 15 - oneharvest = 1 - growthstages = 3 - plant_type = 2 - mutatelist = list(/obj/item/seeds/walkingmushroommycelium) - -/obj/item/seeds/walkingmushroommycelium - name = "pack of walking mushroom mycelium" - desc = "This mycelium will grow into huge stuff!" - icon_state = "mycelium-walkingmushroom" - species = "walkingmushroom" - plantname = "Walking Mushrooms" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom - lifespan = 30 - endurance = 30 - maturation = 5 - production = 1 - yield = 1 - potency = 10 - oneharvest = 1 - growthstages = 3 - plant_type = 2 - rarity = 30 - -/obj/item/seeds/nettleseed - name = "pack of nettle seeds" - desc = "These seeds grow into nettles." - icon_state = "seed-nettle" - species = "nettle" - plantname = "Nettles" - product = /obj/item/weapon/grown/nettle/basic - lifespan = 30 - endurance = 40 // tuff like a toiger - maturation = 6 - production = 6 - yield = 4 - potency = 10 - oneharvest = 0 - growthstages = 5 - plant_type = 1 - mutatelist = list(/obj/item/seeds/deathnettleseed) - -/obj/item/seeds/deathnettleseed - name = "pack of death-nettle seeds" - desc = "These seeds grow into death-nettles." - icon_state = "seed-deathnettle" - species = "deathnettle" - plantname = "Death Nettles" - product = /obj/item/weapon/grown/nettle/death - lifespan = 30 - endurance = 25 - maturation = 8 - production = 6 - yield = 2 - potency = 10 - oneharvest = 0 - growthstages = 5 - plant_type = 1 - rarity = 10 - -/obj/item/seeds/weeds - name = "pack of weed seeds" - desc = "Yo mang, want some weeds?" - icon_state = "seed" - species = "weeds" - plantname = "Starthistle" - lifespan = 100 - endurance = 50 // damm pesky weeds - maturation = 5 - production = 1 - yield = -1 - potency = -1 - oneharvest = 1 - growthstages = 4 - plant_type = 1 - -/obj/item/seeds/harebell - name = "pack of harebell seeds" - desc = "These seeds grow into pretty little flowers." - icon_state = "seed-harebell" - species = "harebell" - plantname = "Harebells" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/harebell - lifespan = 100 - endurance = 20 - maturation = 7 - production = 1 - yield = 2 - potency = 30 - oneharvest = 1 - growthstages = 4 - plant_type = 1 - -/obj/item/seeds/sunflowerseed - name = "pack of sunflower seeds" - desc = "These seeds grow into sunflowers." - icon_state = "seed-sunflower" - species = "sunflower" - plantname = "Sunflowers" - product = /obj/item/weapon/grown/sunflower - lifespan = 25 - endurance = 20 - maturation = 6 - production = 2 - yield = 2 - potency = 10 - oneharvest = 1 - growthstages = 3 - plant_type = 0 - mutatelist = list(/obj/item/seeds/moonflowerseed,/obj/item/seeds/novaflowerseed) - -/obj/item/seeds/moonflowerseed - name = "pack of moonflower seeds" - desc = "These seeds grow into moonflowers." - icon_state = "seed-moonflower" - species = "moonflower" - plantname = "Moonflowers" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/moonflower - lifespan = 25 - endurance = 20 - maturation = 6 - production = 2 - yield = 2 - potency = 15 - oneharvest = 1 - growthstages = 3 - plant_type = 0 - rarity = 10 - -/obj/item/seeds/novaflowerseed - name = "pack of novaflower seeds" - desc = "These seeds grow into novaflowers." - icon_state = "seed-novaflower" - species = "novaflower" - plantname = "Novaflowers" - product = /obj/item/weapon/grown/novaflower - lifespan = 25 - endurance = 20 - maturation = 6 - production = 2 - yield = 2 - potency = 20 - oneharvest = 1 - growthstages = 3 - plant_type = 0 - rarity = 20 - -/obj/item/seeds/appleseed - name = "pack of apple seeds" - desc = "These seeds grow into apple trees." - icon_state = "seed-apple" - species = "apple" - plantname = "Apple Tree" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/apple - lifespan = 55 - endurance = 35 - maturation = 6 - production = 6 - yield = 5 - potency = 10 - plant_type = 0 - growthstages = 6 - mutatelist = list(/obj/item/seeds/goldappleseed) - -/obj/item/seeds/poisonedappleseed - name = "pack of apple seeds" - desc = "These seeds grow into apple trees." - icon_state = "seed-apple" - species = "apple" - plantname = "Apple Tree" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned - lifespan = 55 - endurance = 35 - maturation = 6 - production = 6 - yield = 5 - potency = 10 - plant_type = 0 - growthstages = 6 - rarity = 50 // Source of cyanide, and impossible obtain normally. - -/obj/item/seeds/goldappleseed - name = "pack of golden apple seeds" - desc = "These seeds grow into golden apple trees. Good thing there are no firebirds in space." - icon_state = "seed-goldapple" - species = "goldapple" - plantname = "Golden Apple Tree" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold - lifespan = 55 - endurance = 35 - maturation = 10 - production = 10 - yield = 3 - potency = 10 - plant_type = 0 - growthstages = 6 - rarity = 40 // Alchemy! - -/obj/item/seeds/ambrosiavulgarisseed - name = "pack of ambrosia vulgaris seeds" - desc = "These seeds grow into common ambrosia, a plant grown by and from medicine." - icon_state = "seed-ambrosiavulgaris" - species = "ambrosiavulgaris" - plantname = "Ambrosia Vulgaris" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris - lifespan = 60 - endurance = 25 - maturation = 6 - production = 6 - yield = 6 - potency = 5 - plant_type = 0 - growthstages = 6 - mutatelist = list(/obj/item/seeds/ambrosiadeusseed) - -/obj/item/seeds/ambrosiadeusseed - name = "pack of ambrosia deus seeds" - desc = "These seeds grow into ambrosia deus. Could it be the food of the gods..?" - icon_state = "seed-ambrosiadeus" - species = "ambrosiadeus" - plantname = "Ambrosia Deus" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus - lifespan = 60 - endurance = 25 - maturation = 6 - production = 6 - yield = 6 - potency = 5 - plant_type = 0 - growthstages = 6 - rarity = 40 - -/obj/item/seeds/whitebeetseed - name = "pack of white-beet seeds" - desc = "These seeds grow into sugary beet producing plants." - icon_state = "seed-whitebeet" - species = "whitebeet" - plantname = "White-Beet Plants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet - lifespan = 60 - endurance = 50 - maturation = 6 - production = 6 - yield = 6 - oneharvest = 1 - potency = 10 - plant_type = 0 - growthstages = 6 - mutatelist = list(/obj/item/seeds/redbeetseed) - -/obj/item/seeds/redbeetseed - name = "pack of redbeet seeds" - desc = "These seeds grow into red beet producing plants." - icon_state = "seed-redbeet" - species = "redbeet" - plantname = "Red-Beet Plants" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/redbeet - lifespan = 60 - endurance = 50 - maturation = 6 - production = 6 - yield = 6 - oneharvest = 1 - potency = 10 - plant_type = 0 - growthstages = 6 - -/obj/item/seeds/sugarcaneseed - name = "pack of sugarcane seeds" - desc = "These seeds grow into sugarcane." - icon_state = "seed-sugarcane" - species = "sugarcane" - plantname = "Sugarcane" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane - lifespan = 60 - endurance = 50 - maturation = 3 - production = 6 - yield = 4 - potency = 10 - plant_type = 0 - growthstages = 3 - -/obj/item/seeds/watermelonseed - name = "pack of watermelon seeds" - desc = "These seeds grow into watermelon plants." - icon_state = "seed-watermelon" - species = "watermelon" - plantname = "Watermelon Vines" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/watermelon - lifespan = 50 - endurance = 40 - maturation = 6 - production = 6 - yield = 3 - potency = 10 - plant_type = 0 - growthstages = 6 - mutatelist = list(/obj/item/seeds/holymelonseed) - -/obj/item/seeds/holymelonseed - name = "pack of holymelon seeds" - desc = "These seeds grow into holymelon plants." - icon_state = "seed-holymelon" - species = "holymelon" - plantname = "Holy Melon Vines" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/holymelon - lifespan = 50 - endurance = 40 - maturation = 6 - production = 6 - yield = 3 - potency = 10 - plant_type = 0 - growthstages = 6 - rarity = 20 - -/obj/item/seeds/pumpkinseed - name = "pack of pumpkin seeds" - desc = "These seeds grow into pumpkin vines." - icon_state = "seed-pumpkin" - species = "pumpkin" - plantname = "Pumpkin Vines" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin - lifespan = 50 - endurance = 40 - maturation = 6 - production = 6 - yield = 3 - potency = 10 - plant_type = 0 - growthstages = 3 - mutatelist = list(/obj/item/seeds/blumpkinseed) - -/obj/item/seeds/blumpkinseed - name = "pack of blumpkin seeds" - desc = "These seeds grow into blumpkin vines." - icon_state = "seed-blumpkin" - species = "blumpkin" - plantname = "Blumpkin Vines" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin - lifespan = 50 - endurance = 40 - maturation = 6 - production = 6 - yield = 3 - potency = 10 - plant_type = 0 - growthstages = 3 - rarity = 20 - -/obj/item/seeds/limeseed - name = "pack of lime seeds" - desc = "These are very sour seeds." - icon_state = "seed-lime" - species = "lime" - plantname = "Lime Tree" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lime - lifespan = 55 - endurance = 50 - maturation = 6 - production = 6 - yield = 4 - potency = 15 - plant_type = 0 - growthstages = 6 - mutatelist = list(/obj/item/seeds/orangeseed) - -/obj/item/seeds/lemonseed - name = "pack of lemon seeds" - desc = "These are sour seeds." - icon_state = "seed-lemon" - species = "lemon" - plantname = "Lemon Tree" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon - lifespan = 55 - endurance = 45 - maturation = 6 - production = 6 - yield = 4 - potency = 10 - plant_type = 0 - growthstages = 6 - mutatelist = list(/obj/item/seeds/cashseed) - -/obj/item/seeds/cashseed - name = "pack of money seeds" - desc = "When life gives you lemons, mutate them into cash." - icon_state = "seed-cash" - species = "cashtree" - plantname = "Money Tree" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/shell/moneyfruit - lifespan = 55 - endurance = 45 - maturation = 6 - production = 6 - yield = 4 - potency = 10 - plant_type = 0 - growthstages = 6 - rarity = 50 // Nanotrasen approves... but are these seeds even attainable? Drag the tray to the shuttle? - -/obj/item/seeds/orangeseed - name = "pack of orange seed" - desc = "Sour seeds." - icon_state = "seed-orange" - species = "orange" - plantname = "Orange Tree" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange - lifespan = 60 - endurance = 50 - maturation = 6 - production = 6 - yield = 5 - potency = 20 - plant_type = 0 - growthstages = 6 - mutatelist = list(/obj/item/seeds/limeseed) - -/obj/item/seeds/poisonberryseed - name = "pack of poison-berry seeds" - desc = "These seeds grow into poison-berry bushes." - icon_state = "seed-poisonberry" - species = "poisonberry" - plantname = "Poison-Berry Bush" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/berries/poison - lifespan = 20 - endurance = 15 - maturation = 5 - production = 5 - yield = 2 - potency = 10 - plant_type = 0 - growthstages = 6 - mutatelist = list(/obj/item/seeds/deathberryseed) - rarity = 10 // Mildly poisonous berries are common in reality - -/obj/item/seeds/deathberryseed - name = "pack of death-berry seeds" - desc = "These seeds grow into death berries." - icon_state = "seed-deathberry" - species = "deathberry" - plantname = "Death Berry Bush" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/berries/death - lifespan = 30 - endurance = 20 - maturation = 5 - production = 5 - yield = 3 - potency = 50 - plant_type = 0 - growthstages = 6 - rarity = 30 - -/obj/item/seeds/grassseed - name = "pack of grass seeds" - desc = "These seeds grow into grass. Yummy!" - icon_state = "seed-grass" - species = "grass" - plantname = "Grass" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/grass - lifespan = 40 - endurance = 40 - maturation = 2 - production = 5 - yield = 5 - potency = 10 - plant_type = 0 - growthstages = 2 - mutatelist = list(/obj/item/seeds/carpetseed) - -/obj/item/seeds/carpetseed - name = "pack of carpet seeds" - desc = "These seeds grow into stylish carpet samples." - icon_state = "seed-carpet" - species = "carpet" - plantname = "Carpet" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/carpet - lifespan = 40 - endurance = 40 - maturation = 2 - production = 5 - yield = 5 - potency = 10 - plant_type = 0 - growthstages = 2 - rarity = 10 - -/obj/item/seeds/cocoapodseed - name = "pack of cocoa pod seeds" - desc = "These seeds grow into cacao trees. They look fattening." //SIC: cocoa is the seeds. The trees are spelled cacao. - icon_state = "seed-cocoapod" - species = "cocoapod" - plantname = "Cocao Tree" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod - lifespan = 20 - endurance = 15 - maturation = 5 - production = 5 - yield = 2 - potency = 10 - plant_type = 0 - growthstages = 5 - mutatelist = list(/obj/item/seeds/vanillapodseed) - -/obj/item/seeds/vanillapodseed - name = "pack of vanilla pod seeds" - desc = "These seeds grow into vanilla trees. They look fattening." - icon_state = "seed-vanillapod" - species = "vanillapod" - plantname = "Vanilla Tree" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/vanillapod - lifespan = 20 - endurance = 15 - maturation = 5 - production = 5 - yield = 2 - potency = 10 - plant_type = 0 - growthstages = 5 - -/obj/item/seeds/cherryseed - name = "pack of cherry pits" - desc = "Careful not to crack a tooth on one... That'd be the pits." - icon_state = "seed-cherry" - species = "cherry" - plantname = "Cherry Tree" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/cherries - lifespan = 35 - endurance = 35 - maturation = 5 - production = 5 - yield = 3 - potency = 10 - plant_type = 0 - growthstages = 5 - -/obj/item/seeds/bluecherryseed - name = "pack of blue cherry pits" - desc = "The blue kind of cherries" - icon_state = "seed-bluecherry" - species = "bluecherry" - plantname = "Blue Cherry Tree" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries - lifespan = 35 - endurance = 35 - maturation = 5 - production = 5 - yield = 3 - potency = 10 - plant_type = 0 - growthstages = 5 - rarity = 10 - -/obj/item/seeds/kudzuseed - name = "pack of kudzu seeds" - desc = "These seeds grow into a weed that grows incredibly fast." - icon_state = "seed-kudzu" - species = "kudzu" - plantname = "Kudzu" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod - lifespan = 20 - endurance = 10 - maturation = 6 - production = 6 - yield = 4 - potency = 10 - growthstages = 4 - plant_type = 1 - rarity = 30 - var/list/mutations = list() - -/obj/item/seeds/kudzuseed/New(loc, obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod/parent) - ..() - if(parent) - mutations = parent.mutations - -/obj/item/seeds/kudzuseed/suicide_act(mob/user) - user.visible_message("[user] swallows the pack of kudzu seeds! It looks like \he's trying to commit suicide..") - plant(user) - return (BRUTELOSS) - -/obj/item/seeds/kudzuseed/harvest() - var/list/prod = ..() - for(var/obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod/K in prod) - K.mutations = mutations - -/obj/item/seeds/kudzuseed/proc/plant(mob/user) - if(istype(user.loc,/turf/space)) - return - var/turf/T = get_turf(src) - message_admins("Kudzu planted by [key_name_admin(user)](?) (FLW) at ([T.x],[T.y],[T.z] - (JMP))",0,1) - investigate_log("was planted by [key_name(user)] at ([T.x],[T.y],[T.z])","kudzu") - new /obj/effect/spacevine_controller(user.loc, mutations, potency, production) - qdel(src) - -/obj/item/seeds/kudzuseed/attack_self(mob/user) - plant(user) - user << "You plant the kudzu. You monster." - -/obj/item/seeds/kudzuseed/get_analyzer_text() - var/list/mut_text = list() - var/text_string = "" - for(var/datum/spacevine_mutation/SM in mutations) - text_string += "[(text_string == "") ? "" : ", "][SM.name]" - mut_text += "-Plant Mutations: [(text_string == "") ? "None" : text_string]" - return mut_text - -/obj/item/seeds/kudzuseed/on_chem_reaction(datum/reagents/S) - - var/list/temp_mut_list = list() - - if(S.has_reagent("sterilizine", 5)) - for(var/datum/spacevine_mutation/SM in mutations) - if(SM.quality == NEGATIVE) - temp_mut_list += SM - if(prob(20)) - mutations.Remove(pick(temp_mut_list)) - temp_mut_list.Cut() - if(S.has_reagent("welding_fuel", 5)) - for(var/datum/spacevine_mutation/SM in mutations) - if(SM.quality == POSITIVE) - temp_mut_list += SM - if(prob(20)) - mutations.Remove(pick(temp_mut_list)) - temp_mut_list.Cut() - if(S.has_reagent("phenol", 5)) - for(var/datum/spacevine_mutation/SM in mutations) - if(SM.quality == MINOR_NEGATIVE) - temp_mut_list += SM - if(prob(20)) - mutations.Remove(pick(temp_mut_list)) - if(S.has_reagent("blood", 15)) - production += rand(15, -5) - if(S.has_reagent("amatoxin", 5)) - production += rand(5, -15) - if(S.has_reagent("plasma", 5)) - potency += rand(5, -15) - if(S.has_reagent("holywater", 10)) - potency += rand(15, -5) - -/obj/item/seeds/chilighost - name = "pack of ghost chili seeds" - desc = "These seeds grow into a chili said to be the hottest in the galaxy." - icon_state = "seed-chilighost" - species = "chilighost" - plantname = "chilighost" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili - lifespan = 20 - endurance = 10 - maturation = 10 - production = 10 - yield = 3 - potency = 20 - plant_type = 0 - growthstages = 6 - rarity = 20 - -/obj/item/seeds/gatfruit - name = "pack of gatfruit seeds" - desc = "These seeds grow into .357 revolvers." - icon_state = "seed-gatfruit" - species = "gatfruit" - plantname = "gatfruit" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/gatfruit - lifespan = 20 - endurance = 20 - maturation = 40 - production = 10 - yield = 2 - potency = 60 - plant_type = 0 - growthstages = 2 - rarity = 50 // Seems admin-only. - -/obj/item/seeds/coffee_arabica_seed - name = "pack of coffee arabica seeds" - desc = "These seeds grow into coffee arabica bushes." - icon_state = "seed-coffeea" - species = "coffeea" - plantname = "Coffee Arabica Bush" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/coffee - lifespan = 30 - endurance = 20 - maturation = 5 - production = 5 - yield = 5 - potency = 10 - plant_type = 0 - growthstages = 5 - mutatelist = list(/obj/item/seeds/coffee_robusta_seed) - -/obj/item/seeds/coffee_robusta_seed - name = "pack of coffee robusta seeds" - desc = "These seeds grow into coffee robusta bushes." - icon_state = "seed-coffeer" - species = "coffeer" - plantname = "Coffee Robusta Bush" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta - lifespan = 20 - endurance = 15 - maturation = 5 - production = 5 - yield = 5 - potency = 10 - plant_type = 0 - growthstages = 5 - rarity = 20 - -/obj/item/seeds/tobacco_seed - name = "pack of tobacco seeds" - desc = "These seeds grow into tobacco plants." - icon_state = "seed-tobacco" - species = "tobacco" - plantname = "Tobacco Plant" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/tobacco - lifespan = 20 - endurance = 15 - maturation = 5 - production = 5 - oneharvest = 1 - yield = 10 - potency = 10 - plant_type = 0 - growthstages = 3 - mutatelist = list(/obj/item/seeds/tobacco_space_seed) - -/obj/item/seeds/tobacco_space_seed - name = "pack of space tobacco seeds" - desc = "These seeds grow into space tobacco plants." - icon_state = "seed-stobacco" - species = "stobacco" - plantname = "Space Tobacco Plant" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/tobacco/space - lifespan = 20 - endurance = 15 - maturation = 5 - production = 5 - oneharvest = 1 - yield = 10 - potency = 10 - plant_type = 0 - growthstages = 3 - rarity = 20 - -/obj/item/seeds/tea_aspera_seed - name = "pack of tea aspera seeds" - desc = "These seeds grow into tea plants." - icon_state = "seed-teaaspera" - species = "teaaspera" - plantname = "Tea Aspera Plant" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/tea - lifespan = 20 - endurance = 15 - maturation = 5 - production = 5 - yield = 5 - potency = 10 - plant_type = 0 - growthstages = 5 - mutatelist = list(/obj/item/seeds/tea_astra_seed) - -/obj/item/seeds/tea_astra_seed - name = "pack of tea astra seeds" - desc = "These seeds grow into tea plants." - icon_state = "seed-teaastra" - species = "teaastra" - plantname = "Tea Astra Plant" - product = /obj/item/weapon/reagent_containers/food/snacks/grown/tea/astra - lifespan = 20 - endurance = 15 - maturation = 5 - production = 5 - yield = 5 - potency = 10 - plant_type = 0 - growthstages = 5 - rarity = 20 + ..() // Fallthrough to item/attackby() so that bags can pick seeds up \ No newline at end of file diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index e30fdc8ed22..e2674d81bc8 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -45,7 +45,7 @@ for(var/i in 1 to 3) new /obj/item/weapon/reagent_containers/glass/beaker/noreact(src) if(31 to 35) - new /obj/item/seeds/cashseed(src) + new /obj/item/seeds/cash(src) if(36 to 40) new /obj/item/weapon/melee/baton(src) if(41 to 45) diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index 068e4170180..a40d483ab62 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -11,9 +11,9 @@ lootcount = 1 loot = list(/obj/item/seeds/gatfruit = 10, - /obj/item/seeds/cherryseed = 15, - /obj/item/seeds/glowberryseed = 10, - /obj/item/seeds/moonflowerseed = 8, + /obj/item/seeds/cherry = 15, + /obj/item/seeds/berry/glow = 10, + /obj/item/seeds/sunflower/moonflower = 8 ) /obj/effect/mob_spawn/human/seed_vault diff --git a/tgstation.dme b/tgstation.dme index 3b13be50511..c878726bce9 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1100,16 +1100,24 @@ #include "code\modules\hydroponics\grown\cereals.dm" #include "code\modules\hydroponics\grown\chili.dm" #include "code\modules\hydroponics\grown\citrus.dm" +#include "code\modules\hydroponics\grown\cocoa_vanilla.dm" +#include "code\modules\hydroponics\grown\corn.dm" +#include "code\modules\hydroponics\grown\eggplant.dm" #include "code\modules\hydroponics\grown\flowers.dm" #include "code\modules\hydroponics\grown\grass_carpet.dm" +#include "code\modules\hydroponics\grown\kudzu.dm" #include "code\modules\hydroponics\grown\melon.dm" #include "code\modules\hydroponics\grown\misc.dm" #include "code\modules\hydroponics\grown\mushrooms.dm" +#include "code\modules\hydroponics\grown\nettle.dm" #include "code\modules\hydroponics\grown\potato.dm" +#include "code\modules\hydroponics\grown\pumpkin.dm" +#include "code\modules\hydroponics\grown\replicapod.dm" #include "code\modules\hydroponics\grown\root.dm" #include "code\modules\hydroponics\grown\tea_coffee.dm" #include "code\modules\hydroponics\grown\tobacco.dm" #include "code\modules\hydroponics\grown\tomato.dm" +#include "code\modules\hydroponics\grown\towercap.dm" #include "code\modules\jobs\access.dm" #include "code\modules\jobs\jobs.dm" #include "code\modules\jobs\whitelist.dm"