Rock 1.1 (#788)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Texture update for the original rockfruit PR because I got yelled at. Still not the best but eh better than whatever the fuck we had until now Modularization. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> <!-- Please make sure to actually test your PRs. If you have not tested your PR mention it. --> ## Why It's Good For The Game  No longer will you have to pour bleach in your eyehole when you see the rockfruit. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> 🆑 image: New rockfruit sprites code: Modularized hydroponics /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> <!-- By opening a pull request. You have read and understood the repository rules located on the main README.md on this project. --> --------- Co-authored-by: nevimer <77420409+nevimer@users.noreply.github.com> Co-authored-by: pixelkitty286 <78038207+pixelkitty286@users.noreply.github.com> Co-authored-by: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com> Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com> Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> Co-authored-by: xXPawnStarrXx <53197594+xXPawnStarrXx@users.noreply.github.com> Co-authored-by: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
|
Before Width: | Height: | Size: 970 B |
|
Before Width: | Height: | Size: 1.1 KiB |
@@ -3,7 +3,7 @@
|
||||
desc = "Small seedlings of the golem rockfruit plant. There's a warning label on its packaging: \n\
|
||||
\"Remember: Legally speaking, rocking is more legal than stoning. \n \
|
||||
We are not liable for any injury, death, or complete body evaporation caused by using or growing these plants\""
|
||||
icon = 'modular_zubbers/code/modules/hydroponics/icons/seeds.dmi'
|
||||
icon = 'modular_zubbers/modules/hydroponics/icons/seeds.dmi'
|
||||
icon_state = "seed-rockfruit"
|
||||
species = "rock"
|
||||
plantname = "Rockfruits"
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
|
||||
growthstages = 2
|
||||
growing_icon = 'modular_zubbers/code/modules/hydroponics/icons/growing_fruits.dmi'
|
||||
growing_icon = 'modular_zubbers/modules/hydroponics/icons/growing_fruits.dmi'
|
||||
|
||||
genes = list(/datum/plant_gene/trait/plant_type/weed_hardy,
|
||||
/datum/plant_gene/trait/fire_resistance,
|
||||
@@ -40,7 +40,7 @@
|
||||
force = 5 // Comparatively shit considering a nettle is 15
|
||||
throwforce = 10 // Less shit but hey, it is a rock
|
||||
|
||||
icon = 'modular_zubbers/code/modules/hydroponics/icons/harvest.dmi'
|
||||
icon = 'modular_zubbers/modules/hydroponics/icons/harvest.dmi'
|
||||
icon_state = "rockfruit"
|
||||
|
||||
var/product = /obj/item/food/grown/rockfruit
|
||||
@@ -71,7 +71,7 @@
|
||||
|
||||
foodtypes = FRUIT
|
||||
|
||||
icon = 'modular_zubbers/code/modules/hydroponics/icons/harvest.dmi'
|
||||
icon = 'modular_zubbers/modules/hydroponics/icons/harvest.dmi'
|
||||
icon_state = "rockfruit-peeled"
|
||||
|
||||
tastes = list("mountains" = 1)
|
||||
@@ -81,8 +81,8 @@
|
||||
desc = "The peeled shell of a rockfruit, or as you may call it, \"Literal pile of rocks\". \
|
||||
Probably not edible, but a golem will try to prove you otherwise"
|
||||
|
||||
icon = 'modular_zubbers/code/modules/food_and_drinks/icons/rocks.dmi'
|
||||
icon_state = "rocks"
|
||||
icon = 'modular_zubbers/modules/hydroponics/icons/harvest.dmi'
|
||||
icon_state = "rockfruit-trash"
|
||||
|
||||
foodtypes = STONE
|
||||
food_reagents = list(/datum/reagent/consumable/nutriment/mineral = 5)
|
||||
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1001 B After Width: | Height: | Size: 1001 B |
@@ -0,0 +1,8 @@
|
||||
# BUBBERSTATION MODULAR HYDROPONICS
|
||||
|
||||
## What to put here
|
||||
Any completely new seeds, produce, sprites, and mechanics.
|
||||
Do not put any actual craftable foods here, instead either create or use, (if already created) the relevant modular folder.
|
||||
|
||||
|
||||
Overrides of mechanics on parent repos (TG, Skyrat) should still be done in the code folder.
|
||||
@@ -8288,7 +8288,6 @@
|
||||
#include "modular_zubbers\code\modules\ghostcafe\hilbertshotel_silicon.dm"
|
||||
#include "modular_zubbers\code\modules\hydroponics\gene_modder.dm"
|
||||
#include "modular_zubbers\code\modules\hydroponics\plant_genes.dm"
|
||||
#include "modular_zubbers\code\modules\hydroponics\grown\rocks.dm"
|
||||
#include "modular_zubbers\code\modules\job_estimation\code\dead.dm"
|
||||
#include "modular_zubbers\code\modules\jobs\_job.dm"
|
||||
#include "modular_zubbers\code\modules\jobs\job_types\blacksmith.dm"
|
||||
@@ -8382,7 +8381,6 @@
|
||||
#include "modular_zubbers\code\modules\uplink\uplink_items\device_tools.dm"
|
||||
#include "modular_zubbers\code\modules\uplink\uplink_items\job.dm"
|
||||
#include "modular_zubbers\code\modules\vending\halloween_chocolate.dm"
|
||||
#include "modular_zubbers\code\modules\vending\megaseed.dm"
|
||||
#include "modular_zubbers\code\modules\~donator\choicebeacon.dm"
|
||||
#include "modular_zubbers\maps\biodome\area.dm"
|
||||
#include "modular_zubbers\maps\biodome\beach.dm"
|
||||
@@ -8463,7 +8461,9 @@
|
||||
#include "modular_zubbers\modules\gladiator\code\game\objects\items\gladiator_items.dm"
|
||||
#include "modular_zubbers\modules\hemophages\code\limbgrower.dm"
|
||||
#include "modular_zubbers\modules\hemophages\code\species.dm"
|
||||
#include "modular_zubbers\modules\hydroponics\code\grown\rocks.dm"
|
||||
#include "modular_zubbers\modules\hydroponics\code\plantgenes\hydroponics.dm"
|
||||
#include "modular_zubbers\modules\hydroponics\code\vending\megaseed.dm"
|
||||
#include "modular_zubbers\modules\jobs\code\job_types\quartermaster.dm"
|
||||
#include "modular_zubbers\modules\jobs\code\job_types\warden.dm"
|
||||
#include "modular_zubbers\modules\jobs\code\trims\jobs.dm"
|
||||
|
||||