Commit Graph

50 Commits

Author SHA1 Message Date
dovydas12345
adf12c87fa Requested changes 2018-11-10 12:17:27 +02:00
dovydas12345
6444a5fa3f The correct check 2018-11-09 23:00:17 +02:00
dovydas12345
c552335bd9 Removes the unneeded check 2018-11-09 20:55:57 +02:00
dovydas12345
832a53e10d Slicing grown snacks 2018-11-09 19:54:41 +02:00
variableundefined
7905b64076 Port over fermentation barrel, minor refactor of reagent container, add in wine power etc. 2018-11-01 11:01:45 +08:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox-McCloud
ca49a28f02 Updates Hydroponics, Nerfs it, Adds Onions 2017-08-01 17:58:23 -04:00
Crazylemon64
a8e7716649 Refactors slipping to be completely general for items 2017-07-16 19:20:55 -07:00
Fox-McCloud
5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Fox-McCloud
838d58b1a5 for fixes 2017-03-28 01:06:03 -04:00
Fox-McCloud
6d4316264a plant analyzer QoL 2017-01-29 03:37:22 -05:00
Fox-McCloud
73ac77e8df runtimes 2017-01-26 04:23:43 -05:00
Fox-McCloud
dc0710135e more fixes 2017-01-23 00:53:44 -05:00
Fox-McCloud
ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00
Fox-McCloud
bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Tigercat2000
57648bd6b7 Fix multiple instances of to_chat not being used 2016-04-23 20:45:37 -07:00
Fox-McCloud
afddc2d8f1 Fixes+Cleans Up Cold+Heat Resist Mutations 2016-04-15 00:38:44 -04:00
TheDZD
d95102b007 Merge pull request #4158 from Fox-McCloud/killer-tomato
Killer Tomatoes Live Up to their Name
2016-04-14 19:12:34 -04:00
Fox-McCloud
49f59234e6 tweaks 2016-04-11 22:24:35 -04:00
Tastyfish
7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Fox McCloud
ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
2016-03-04 19:51:50 -05:00
FalseIncarnate
d2ae37c540 Cocoa Spelling and Relative Pathing Cleanup
Standardized the spelling of "Cocoa", as this was inconsistent
- One spot refers to it as cacao still, but that is because it is in the
legit latin scientific name. Everything else is now cocoa (not coco).

Chocolate now will provide some nutrition (and make you fat if you eat a
lot)
- Cocoa Powder (the arguably main component of chocolate) provided
nutrition, but that nutrition mysteriously vanished when you combine it
with milk and sugar. Now chocolate provides the same nutrition as the
cocoa powder in it

Merged a number of cases where foods had both chocolate and cocoa to now
have just chocolate
- In the case where both were present, the volumes were combined to
maintain food sizes

Renamed cocoa pile to chocolate pile, as this was wrong
- The cocoa pile claimed to be a pure cocoa powder pile, but was
actually just chocolate that was dumped on the floor.

Removed a fair amount of relative pathing, but there's still more to go.
2016-02-24 16:34:23 -05:00
Aurorablade
948adea83b Added Asses as an organ
...made you look...
seriously though, refined some surgery datums/steps and commiting so i
can go bugfix some stuff...and a sidequest...i need to adjust return
values.
2016-01-04 08:25:39 -05:00
Fox-McCloud
c7073e52b8 glowcaps 2015-12-08 16:44:07 -05:00
Fox-McCloud
cf42d3b037 Re-Adds Weapon Based Nettles 2015-12-08 07:24:43 -05:00
Fox-McCloud
0bbd8ea8d2 Botany QoL Changes 2015-11-30 20:03:59 -05:00
FalseIncarnate
a3570a36c9 Grammar Fixes, Less Shouting (still praising)
Converting a novaflower to it's weapon form now has only a 10% chance to
actually make you shout "PRAISE THE SUN!"
- Rest assured though, that you will still be praising the sun
internally when doing this even if you don't shout it.

Fixes some grammar mistakes on the cashpod results.
2015-11-28 17:22:01 -05:00
FalseIncarnate
f2c530a580 Item Plants, Grown Weapons, Botany Fixes/Changes
Botany plants can grow preset items, mobs, or fruit
- Turns out that the code for mob harvestables could be used almost
unchanged to support item harvestables
- Changed some variable names to better reflect this

Re-introduces the Egg Plant!
- Grow eggs to throw at the security officer who confiscated your
ambrosia!
- Mutant species of Eggplants
- Exactly the same as eggs laid by chickens, except they shouldn't hatch

Adjusts code and logic order to avoid a conflict with TRAIT_SPREAD
fruits that can be converted into other items
- Grass, aloe, and comfrey were either unable to be converted or unable
to be planted outside a tray if they had TRAIT_SPREAD due to logic
ordering
- You must now be in DISARM intent to plant spreading fruits
- Being in HELP or GRAB will attempt to convert the fruit into a
poultice or other item as appropriate.
- If the plant does not have TRAIT_SPREAD, you may also use DISARM to
accomplish this

Adds Money Trees!
- Literally grows money-filled fruit called Cashpods
- Fruit contains gold and silver reagents, or can be turned into space
cash by using it in-hand like grass or aloe
- Value of the resulting space cash is related to potency. Higher
potency = higher dosh!
- Eating the fruit doesn't give you money, but may fill you with guilt
(not really).
- Mutant species of lemons.
- When life gives you lemons...

Adds the ability to convert sunflowers and novaflowers into their
"weapon" forms
- Done exactly the same as converting grass, aloe, comfrey, or cashpods
(use in-hand on help/grab intent)
- Sunflower conversion is silent, though the item description changes
- Novaflower conversion is not silent. You'll know when it happens.
- Hitting someone with a sunflower (weapon form) or novaflower (weapon
form) will assault both parties with a green and yellow message. FLOWER
POWER!
- Hitting someone with a novaflower (weapon form) will increase their
body temperature, and may cause burns as a result
- Picking up a novaflower (weapon form) without gloves will cause burns,
but doesn't drop the flower.

COMPLETELY DELETES the code\objects\items\weapons\hydroponics.dm file
- This file was 90% commented out already, and I moved the remaining
code into code\modules\hydroponics\grown_inedible.dm for organization
- This affects the .dme by removing a single line as the file is no
longer included.
2015-11-28 02:56:59 -05:00
TheDZD
733dcac24a Merge pull request #2663 from FalseIncarnate/master
Weaponized Botany Changes
2015-11-27 12:28:48 -05:00
FalseIncarnate
acc8498d62 Fruit Weapon Targetting Fix
Fixes fruit weapons not properly targeting the intended limb and thus
not properly checking protection from stinging.
2015-11-26 02:21:48 -05:00
FalseIncarnate
7702b5957d Weaponized Botany Changes
HEAVILY nerfs spreading plants!
- Spread chance cut down by 66%
- In general, plants will spread slower, meaning they won't outpace a
goat wielding a scythe and plant-killer grenades.
- Spread distance cut down by AT LEAST 66%
- TRAIT_SPREAD 1 plants (glowshrooms) will spread to a maximum distance
of (TRAIT_POTENCY * 0.1)
- TRAIT_SPREAD 2 plants (kudzu) will spread to a maximum distance of
(TRAIT_POTENCY * 0.6) if they are vines or biomass growth_type (most
common types)
- TRAIT_SPREAD 2 that have the "worms" or "mold" growth_type will spread
to a maximum distance of (TRAIT_POTENCY * 0.3)

Buffs spreading plants!
- Spreading plants with thorns or stinging will now properly attempt to
affect anyone who walks over them!
- Wearing shoes gives you a 50% chance to avoid being affected by thorns
and stings

Rewrites stinging plant defenses and logic
- Stinging plants now will target a specific limb/body part and check
for the appropriate clothing coverage
- Spreading plant stings will only target legs and feet
- Picking up stinging fruit will only target hands
- Being hit with a stinging fruit will target the hit limb
- THICKMATERIAL clothing from hardsuits and biosuits will protect from
stings that target areas they cover
- Clothes will protect their covered areas from stings
- Protecting the head requires covering the eyes and mouth with either
the helmet or glasses/masks
- If you aren't fully protected in the target area, you get stung.

Fruit with thorns and/or stinging now properly apply their effects when
thrown or used as melee weapons
- Still requires HARM intent to use fruit as a melee weapon instead of
feeding it to the target
- Stinging fruit will check the hit area for protection
- Stinging fruit will crumble into dust if it uses up all its reagents.
- Stringing fruit still has a chance to break on hit even while it has
reagents left.
2015-11-26 01:27:21 -05:00
Fox-McCloud
a5b9f5f78e Adds in Aloe Vera and Comfrey 2015-11-25 01:37:58 -05:00
Fox-McCloud
e17c6bde22 Another del->qdel pass 2015-10-08 16:49:10 -04:00
Tigercat2000
be92665871 Replace magic intent words with defines, grab fixes
This commit does the following:
 - Replaces all instances of magic intent words, like "harm" and
 "help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM

 - Fixes a few manual grab instances left over in attack_alien, they
 will now used grabbedby()
2015-09-07 11:51:00 -07:00
Markolie
87570fc080 isNonCrewAntag() checks, key_name fixes 2015-08-20 17:25:55 +02:00
FalseIncarnate
133b1233f9 Assorted Fixes and Returns Accidentally Removed Features
Fixes mutant plants not properly inheriting preset icons

Fixes preset icons incorrectly having a color overlay applied
- This was most noticeable on berries, as the color overlay would render
most of the icon black or red, instead of the intended multi-color icon

Returns emote capabilities to diona nymphs
- Accidentally removed by #1171

Returns Moonflowers, Novaflowers, Ghost Peppers, and Koi Beans
- Accidentally removed by #980
- Sunflowers can mutate into Moonflowers or Novaflowers
- Novaflowers contain pure welding fuel
- Moonflowers contain plantmatter and moonshine
- Chili peppers can mutate into Ghost Peppers or Ice Peppers
- Ghost Peppers contain plantmatter, capsaicin, and condensed capsaicin
- Soybeans can mutate into Koi Beans
- Koi Beans contain plantmatter and carpotoxin

Returns Hydroponics Harvests tracking for End-of-Round score
- Accidentally removed by #980

Updated the descriptions for plants to account for moonshine, welder
fuel, and carpotoxin
- This is to maintain consistency with other reagent-based descriptions
for the plants
2015-08-11 03:05:43 -04:00
FalseIncarnate
fb203fe569 Botany Modular Icon Revert, also Peanuts
Removes modular sprites from nearly all pre-defined seed products.
- The following plants still utilize modular icons:
- Random Seeds (Strange Plants)
- Grass
- S'randar's Hand leaves
- Messa's Tear leaves
- Telriis Grass
- Thaa'dra Lichen
- Jurl'mah Reeds
- Amauri Plant
- Gelthi Plant
- Vale Bush
- Surik Vine
- Test and Test 2

Added a new plant, peanuts!
- Seeds available from MegaSeed vendor in hydroponics
- Will be included in future kitchen recipes in a separate PR
2015-08-05 05:05:26 -04:00
FalseIncarnate
27f4ccda36 Grinder Fix, Botany qdel Refactor, Removes PanDEMIC2200
Fixes the reagent grinder machines not properly grinding tomato into
ketchup and rice into rice

Updates botany code to use qdel over del to help alleviate potential lag
from del calls

Removes the PanDEMIC 2200 board from Tech Storage and the Circuit
Imprinter, as the computer it builds has been commented out for a long
time. Also deletes the commented out code (over 250 lines of commented
out code deleted)
2015-07-01 22:09:37 -04:00
FalseIncarnate
3166200c5e Diona Nymph runtime and Fruit Attack fixes
Fixes a runtime preventing Diona Nymphs from eating weeds and regaining
nutrition

Fixes fruit attacks checking for "hurt" when they should check for
"harm".
- You can now smack people with fruit on harm intent. If the plant has
TRAIT_STINGS, it will inject them with it's chemicals
- You can now crush a fruit in your hand on harm intent to destroy it
(will not leave trash like banana peels!). This will trigger the same
effects that throwing the fruit would have, except without needing to
throw it.
- Use this to activate that smoke-screen tobacco you spent all round
mutating, or to make a quick escape with your bluespace tomato!
2015-06-16 17:09:39 -04:00
FalseIncarnate
fe2908ef67 Re-adds Psilocybin Check for Fruit Descriptions
Since we still have psilocybin. removing it from the check entirely was
unnecessary. Fruit with Psilocybin, LSD, or Space Drugs will now all
properly display the "hallucinogenic" descriptor.
2015-05-18 00:15:43 -04:00
FalseIncarnate
e4e41ce24c Fruit Description Fix
Fixes checks for old chems to use ones for new chems. Some of these
chemicals currently aren't in any fruits (like juices) but may appear
once we expand the chem list for random seeds.

Will update the descriptions to account for new chems at such time that
goof's PR is finished if he doesn't include it.
2015-05-17 21:38:32 -04:00
FalseIncarnate
498aad09cb Empty Slices Fix
Fixes watermelon slices being empty.

Potatoes, carrots, and watermelons will now properly transfer their
reagents to the new slices when chopped/sliced, divided evenly across
the total number of slices.

Watermelons create 5 slices, carrots and potatoes only create 1 (since
they are a plate/pile of fries/sticks).
2015-05-14 02:07:35 -04:00
FalseIncarnate
b602e3d5e3 Botany Fixes and Telescopic Scythes
- Ports https://github.com/Baystation12/Baystation12/pull/9184 from
Baystation

- Prevents deconstruction of soil and invisible soil
- Fixes #1011

- Adds a verb to eject tanks from hydroponics trays if one is inserted
- Don't think anyone has actually done this, but it has been possible
for a LONG time and will be more useful once I get the atmos portion of
botany working

- Fixes grown items not leaving behind their trash
- Notably banana peels and corn cobs. Clowns and hillbillies rejoice!

- Adds 15% chance for a watermelon to leave behind a pack of it's seeds
when eaten.
- Slicing watermelon will not produce seeds ever

- Replaces the Janitorial ERT members' plant-b-gone sprays with new
Telescopic Scythes!
- Can be collapsed to fit on a belt or fit in pockets/bags
- While collapsed, it loses a large amount of it's damage, is not
considered sharp or as having an edge, and cannot cut vines like a
normal scythe. Extended ones are functionally identical to normal
scythes
- Extending and collapsing a telescopic scythe has some awesome sounds
from Freesound.org
2015-05-12 23:00:02 -04:00
Tigercat2000
92c5d0139a Fix hydroponics to use the right light system
This commit updates hydroponics to the new light system, so it stops
compile-error'ing
2015-05-10 14:09:57 -07:00
FalseIncarnate
db9d9fc647 Botany / Xenobotany Update
Largely a port of https://github.com/Baystation12/Baystation12/pull/8038
(Credit to Zuhayr for his hard work on botany)

Breakdown of the port:
- Plant traits have been expanded drastically
- You want a bio-luminescent tomato that explodes into a cloud of acid
when thrown or stepped on? Or maybe a corn vine that entangles people
and injects them with mannitol and it's harvests that can be used as a
battery? Totally possible.
- Adds new random seeds! Replaces the egg-plant seed in the exotic seeds
crate from cargo with 2 of these.
- Literally random, they have randomly generated stats, chemicals, and
traits. Great for researching, and/or wasting cargo's supply points.
- Plant analyzers can now print off the last scan they recorded, meaning
you can distribute copies of the report to validate your claims of
having the dankest weed on station.
- Potatoes, carrots, watermelons, soybeans, and pumpkins can all be
sliced/diced/carved with ANY sharp object, such as knives, hatchets,
glass shards, and e-swords.
- This should give the chef a bit more room to make it look like he
actually is doing the work by slicing up fries by hand. The processor
still also works.
- New reagent: Wood Pulp
- Currently has no use in recipes, but any plant with this reagent in it
can be chopped into planks with a hatchet. Did someone order some
Ambrosia Deus planks?
- Also, vines with woodpulp are dense. You have been warned.

Now onto the stuff I did in addition to the stuff from Bay.
- Fixed typos where plasma was mistakenly called "phoron" in the port.
(Sorry bay)
- Replaced bay's botany mutation chances with our tiered mutation
system.
- Re-re-added tobacco, space tobacco, tea aspera, tea astra, coffee
arabica, and coffee robusta.
- Re-enabled the rolling of joints
- Made it possible to hand-roll cigarettes from tobacco / space tobacco.
(A requested / promised addition)
- Just like with joints, it will inherit any chems in the tobacco, has
the same reagent capacity as a joint, but looks and smokes like a cig
(lasts as long as the cigarettes) with a different name/description to
differentiate it from pre-made cigs.
- Corn can now be juiced in the grinder, in addition to grinding it.
Grinding corn will result in it's contained reagents (like corn starch),
while juicing corn will result in corn oil.
- Re-added the additional plant analyzer information when scanning trays
(displays age, weed level, etc)

Also cleaned up the recipes_microwave.dm file, removing the commented
out recipes that were distributed to the other machines during the
Kitchen Overhaul. Shortens the file a bit and makes it more readable.

I probably forgot stuff, so I will add things as I remember them / they
get pointed out.
2015-05-09 06:00:24 -04:00