Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Добавление огурцов v2.0 #13530

Merged
merged 12 commits into from
Sep 29, 2024
Merged

Добавление огурцов v2.0 #13530

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bbb0fc2
Добавление огурцов v2.0
Sep 8, 2024
db7678b
перевёл семена типа дааа
Bobloxer2009 Sep 10, 2024
9adb44f
перевёл огурец в grown
Bobloxer2009 Sep 10, 2024
192d7ec
возвращаем пачке огурцов нормальное название
Bobloxer2009 Sep 10, 2024
1bbdf41
козёл душит огурец лапой (перевод)
Bobloxer2009 Sep 10, 2024
757a632
Merge branch 'master' of https://github.com/TauCetiStation/TauCetiCla…
Sep 26, 2024
469d2ad
Спрайты поменял, всё норм
Sep 26, 2024
072859e
Merge branch 'TauCetiStation:master' into ogyrsiv2.0
Bobloxer2009 Sep 26, 2024
59270af
Чёта поменял
Sep 26, 2024
4a8caac
Merge branch 'ogyrsiv2.0' of https://github.com/Bobloxer2009/TauCetiC…
Sep 26, 2024
942364c
Вальтер снисходительно подарил огурцам новый спрайт[kaif]
Sep 27, 2024
cb2616b
Меняем циферку с 3 до 1
Bobloxer2009 Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions code/defines/obj/hydro.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,23 @@
plant_type = 0
growthstages = 1

/obj/item/seeds/cucumberseed
name = "pack of cucumber seeds"
desc = "These seeds grow into cucumbers."
icon_state = "seed-cucumber"
hydroponictray_icon_path = 'icons/obj/hydroponics/growing_vegetables.dmi'
species = "cucumber"
plantname = "Cucumbers"
product_type = /obj/item/weapon/reagent_containers/food/snacks/grown/cucumber
lifespan = 30
endurance = 20
maturation = 3
production = 4
yield = 4
potency = 4
plant_type = 0
growthstages = 4

/obj/item/seeds/tobacco_space
name = "pack of space tobacco seeds"
desc = "These seeds grow into space tobacco plants."
Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/vending/hydroponics.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
/obj/item/seeds/bananaseed = 3,
/obj/item/seeds/berryseed = 3,
/obj/item/seeds/cabbageseed = 3,
/obj/item/seeds/cucumberseed = 3,
/obj/item/seeds/carrotseed = 3,
/obj/item/seeds/cherryseed = 3,
/obj/item/seeds/chantermycelium = 3,
Expand Down
5 changes: 5 additions & 0 deletions code/modules/cargo/exports/grown.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ use it if low potency results garbage from harvested crop
cost = 15
export_types = list(/obj/item/seeds/bananaseed)

/datum/export/seed/cucumber
unit_name = "pack of cucumber seeds"
cost = 15
export_types = list(/obj/item/seeds/cucumberseed)

/datum/export/seed/rice
unit_name = "pack of rice seeds"
cost = 15
Expand Down
13 changes: 13 additions & 0 deletions code/modules/reagents/reagent_containers/food/snacks/grown.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,19 @@
reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
bitesize = reagents.total_volume

/obj/item/weapon/reagent_containers/food/snacks/grown/cucumber
seed_type = /obj/item/seeds/cucumberseed
name = "cucumber"
desc = "Looks like a cucumber."
icon_state = "cucumber"
potency = 15
filling_color = "#598157"

/obj/item/weapon/reagent_containers/food/snacks/grown/cucumber/atom_init()
. = ..()
reagents.add_reagent("ethylredoxrazine", 3+round((potency / 10), 1))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Мне кажется это слишком имбово для какого-то огурца

image

Copy link
Contributor Author

@Bobloxer2009 Bobloxer2009 Sep 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Учитывая, как (не)популярна ботаника и учитывая как ей обычно нечасто пользуются (кроме повара), то нормально. Да и мало особо растений в которых есть что-то кроме нутриментов

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

опохмел в огурцах это гениально

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Я о том, что цифры перекручены, а не про эффект

bitesize = reagents.total_volume

/obj/item/weapon/reagent_containers/food/snacks/grown/berries
seed_type = /obj/item/seeds/berryseed
name = "bunch of berries"
Expand Down
Binary file modified icons/obj/hydroponics/growing_vegetables.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/hydroponics/harvest.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/hydroponics/hydroponics.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/hydroponics/seeds.dmi
View file
Open in desktop
Binary file not shown.
Loading