Commit Graph

66 Commits

Author SHA1 Message Date
AffectedArc07 c99c56411d Merge pull request #14034 from farie82/throw-and-fruit-logging
Improves botany fruit logging. Makes throws not spam admins when the item does no damage
2020-08-08 16:34:47 +01:00
joep van der velden d89572afee review changes 2020-08-08 07:39:25 +02:00
joep van der velden f4910dcc79 Makes grown/On_Consume actually work properly 2020-08-08 00:03:16 +02:00
joep van der velden 0cccd0ebf0 Improves botany fruit logging. Make throw logging more logical 2020-08-07 23:55:11 +02:00
warior4356 cb06ebdd9f Refactor complete. Matches added. 2020-07-13 22:05:56 -07:00
Kyep 547d76fb4b Cyborg Improvements (#13056)
* ash storm immunity

* safety override & lavaproof upgrades

* mini-extinguisher for janiborg

* borg cell paths, prevent station borgs using gamma module

* Limit crew SecBorgs to 2, DS borg laser reflection

* replaces standard module with generalist module

* generalist borg gets crowbar

* fix bug where ert engi/med borgs runtime / do not get sprites

* adds TG lavaland and spidermin mining cyborg icons

* roundstart borgs=2, spawn locations=4

* adds damage_protection mechanic

* add xeno_disarm_chance

* ERT borg naming scheme: (level) ERT (number)

* std borg: tweaks hypo, RMs holoproj, adds mats/subsystems

* AA bullet_arc refactor

* refactors var/require_module to be bool, proc/action() to return bool

Suggested by farie82

* better radio for generalist

* rework gamma borgs, split of destroyer borgs

* dead robots fix

* fixes error caused by merging of PR 12932

* manually fix line endings

* fixes borg energy weapons (except disablers) not being recharged within recharging stations

* add trailing newline to make travis pass

* compatibility with #13471 life refactor

* deletes change to gamma sec ERT laser beam energy cost

* refactor handling of ash/lava immunities

* removes spiderlike mining borg sprite

* tweaks generalist borg loadout

* limit secborgs to 1 on green alert / roundstart

* re-run icondiffbot

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-06-28 14:16:14 -06:00
Fox McCloud b3d69aac9b Moves to BYOND 513 (#13650)
* Fixes Orbiting

* moves to 513

* travis update

* check for minor version too
2020-06-26 01:15:59 -06:00
SteelSlayer db4d44901d on cross removal 2020-06-24 11:33:31 -05:00
SteelSlayer 7088de6bab slippery component 2020-06-06 15:35:12 -05:00
SteelSlayer c2813a73e2 Removes the Freeze Mech verb, and bundles its functionality into the Freeze verb (#12827)
* Makes the Freeze Mech admin verb work properly

* freeze overhaul, axe Freeze Mech verb

* define freeze on the atom/movable level

* CRLF to LF

* rebase and touch ups

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2020-05-21 21:41:00 -06:00
Pidgey 43f664f4a7 Diona nymphs can eat veggies (#12423)
* Diona Nymphs can now consume vegetables. It takes 2 seconds to do so, and they gain nutrition based on how much plant matter and/or nutriment is present. This tends to be a slightly slower way to grow than eating weeds (unless specialized plants are provided for the purpose, like high potency pumpkins) but provides an option to nymphs that have nothing but earthsblood trays around.

* Changed the spacing a bit.

* Changing some minor things in line with provided code reviews.

* Hopefully this is an improvement.

* Requested minor changes

* Swapped type check with isnymph(). I didn't even know these defines existed.
2020-05-21 20:21:42 -06:00
Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
farie82 0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud 94cd248b20 Fixes Some Null Tastes and Fruit Wine 2019-09-01 18:59:13 -04:00
Mark van Alphen fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
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