Commit Graph

751 Commits

Author SHA1 Message Date
oranges 6eb62fbba4 Merge pull request #34110 from Armhulen/patch-40
shadowshroom nerf reverted
2018-01-09 15:06:25 +13:00
Armhulen 73723e4529 thank fuck 2018-01-04 22:04:38 -08:00
YPOQ 2926f9ed62 Fixes plant juicing (#33896) 2017-12-29 03:55:45 -05:00
Jordan Brown bc20a758d5 Merge pull request #33783 from Cruix/fix_blind
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 11:45:45 -05:00
arsserpentarium 95b9e19cd9 [READY]Circuitry upgrades (#33579)
* heater,xenobio scan,smoker fix,kill vines,pathfinder

* 1.drag component
2.damage for bot and machines(?)
3.EPv2 scaner(takes ref to thing.returns adress of epv2 adress if there is one)
4.fix work of arithmetic pins

* Update input.dm

* fix, scaner

* grinder,juicer,smokefix, runtime fix

* lag

* Update game_options.txt

* Update reagents.dm

* Update assemblies.dm

* Update grown.dm

* Update grown.dm

* 111

* Delete electronic_components.dmi

* 222

* merge

* Update reagents.dm

* Update assemblies.dm

* concat unfuck

* concat unfuck 2

* reagents

* fixes

* fix2

* hooks

* math

* 111

* sense

* leave it for now.

* fix

* fix(2)

* requested

* okay

* uhhh

* sorry

* kevinz's smoker nerf is enought

* hooks2

* fix for reagents push ref.
2017-12-23 22:55:37 -05:00
Ian Turk c7f00fb44c Prefixed all disability defines with DISABILITY to fix name collision with BYOND built in BLIND define 2017-12-22 23:49:41 -06:00
ACCount 40699a8aea [READY]Refactors reagent container types (#33470)
* Replaces a bunch of manual OPENCONTAINER checks with helper procs

* Removes unnecessary vars

* Updates reagent bitflags, adds some new ones

* Replaces most of the is_open_container calls with more specific ones

* Puts new AMOUNT_VISIBLE flag to use

* Uses new helper procs in more objects

* Standardizes chemicals logging

* De-snowflakes two more checks

* Fixes

* Minor fixes and improvements
2017-12-18 22:55:01 -06:00
Emmett Gaines 25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -05:00
Ashe Higgs d447acdc6e All-In-One grinder results are now defined by type, not by huge lists (#33181)
I had some time free, and noticed how awful the reagent grinder code was - it used huge static lists containing types and their associated reagents from grinding.

This is now split into two new vars on /obj/item - var/list/grind_results and var/list/juice_results, as well as two new helper procs, on_grind() and on_juice() to allow those to change based on conditions like plant potency. Such checks and the like have been moved to that. If any of these procs return -1, the operation is canceled.

I also fixed some of the recipes that didn't work. The reagent IDs for them didn't exist, leading me to believe that they weren't tested. I corrected that! (I've tested every single recipe in this PR, with the exception of a few juicing-related ones.)
2017-12-15 10:48:25 +13:00
vuonojenmustaturska 5233ec1f6a Finishes the forceMove port (#33519)
* a thing

* thingy 2: electric boogaloo

* Obligatory webeditor commit
2017-12-15 10:39:34 +13:00
oranges a0146be33b Fixes the free worker bee getting stuck in the hive and never leaving (#33451)
ten outta ten code
2017-12-12 16:57:24 -05:00
Jordan Brown dff4c8a862 Merge pull request #33241 from swindly/suicide
Adds some suicide acts
2017-12-09 16:22:00 -05:00
ACCount e474a90342 Fixes random in random seeds (#33362)
* Fixes random in random seeds

* removed kwargs
2017-12-08 19:10:23 +01:00
swindly 94f83561a8 fixes suicide acts 2017-12-07 16:27:29 -05:00
swindly f7966deae4 makes residue scatter on suicide, makes fake disk suicide less interesting, makes melon seeds manual suicide 2017-12-05 17:57:08 -05:00
oranges bd954fe780 Merge pull request #32964 from AutomaticFrenzy/patch/joules
Measure energy values in joules
2017-12-05 20:42:25 +13:00
ACCount 88187f86d5 Moves some machine sprites into /machines/ folder (#33124)
* Moves biogenerator.dmi

* Separates cryogenic2.dmi into 3 sprite files

* Updates a map

* moves suit storage sprite

* Gives cameras their own file
2017-12-04 14:45:35 +01:00
Tad Hardesty c6da68ab62 Measure energy values in joules 2017-12-02 16:05:31 -08:00
oranges 73b25d7ef2 Refactor on_reagent_change to pass through the change type (#32805)
this is purely so the smoke circuit can reset the notification only when
reagents are actually added to it
2017-11-24 12:45:44 +01:00
ShizCalev ed12ad417d Updates some item drops to use drop_location() (#32994)
* Updates some item drops to use drop_location()

* Little more cleanup
2017-11-24 06:04:50 -05:00
Emmett Gaines 7c69cdcb8a Revert math (#33059)
* Revert "all this wrapping and it's not even christmas (#33035)"

This reverts commit faaf151580.

* Revert "fuck me for forgetting to graph this one"

This reverts commit 45d7acea2f.

* Revert "defines math"

This reverts commit 2817a1737b.
2017-11-23 20:59:52 -05:00
ninjanomnom 45d7acea2f fuck me for forgetting to graph this one 2017-11-23 00:28:20 -05:00
ninjanomnom 2817a1737b defines math 2017-11-22 17:36:58 -05:00
ShizCalev 02abe5d92f Makes drinking glasses smash when thrown (#32890)
* Makes drinking glasses smash when thrown

* Maintains bartender snowflake behavior

* Extended to all bottles, cartons, cleaned up 1 & 0

* Corrected breaking bottles on heads.

* Reduced glass spawn chance to 33%
2017-11-20 09:45:08 +01:00
kevinz000 caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
ShizCalev eb22fed8a6 Consistency 2017-11-18 14:17:38 -06:00
Dax Dupont 8982f0393b Fixes hydroponics not properly dealing with fluorine (#32813)
fluorine was misspelled
2017-11-17 13:49:17 -05:00
Jordie 8b19b490d1 JSON feedback (#32188)
* wip

* wip2

* makes code actually compile on 511 + fixes

* versioning

* s

* adds python conversion script, schema change and removes 'force ' from item_used_for_combat

* fix to compile

* forgot to actually commit this
2017-11-17 02:43:12 -05:00
vuonojenmustaturska 3f582454a8 Minor speedups to movement: First Blood Part 2 (#32702) 2017-11-14 18:59:45 -02:00
Jordan Brown 2d04e1172d Merge pull request #32641 from praisenarsie/patch-8
blah blah adds some initialize() for squeaky clean code and performance
2017-11-13 12:37:22 -05:00
Ashe Higgs 5946689f10 Improves the deep fryer (#32482)
While I was messing with vitamins and nutrients, I decided to touch up on deep fryers as a separate project. A demo of sounds can be found here, using the looping sound framework added recently. Also, sound quality in the video is kind of terrible; it sounds much nicer in-game.

Fryers themselves now use the cooking oil reagent, which is new and can be obtained by grinding soybeans (for vegetable oil) or meat (for oil derived from fats.) This does include synthmeat, which you can also use for meat anyway! By default it takes about 1.2 units of oil to fry one object.

Also adds oil_use and fry_speed vars that determine how well the fryer does its job. These values start at ~0.04 and 1 respectively, and can be brought to 0.01 and 4 with max-tier parts (each fryer uses one micro laser.)

Cooking oil itself can be heated to 450 K to bring out its latent frying powers. When splashed on object, it will fry them instantly (albeit inefficiently)... and can also fry humans and other creatures rather painfully.
2017-11-13 22:15:07 +13:00
FrozenGuy5 5294c48be1 Adds alot more initialize() part two 2017-11-12 10:56:33 +00:00
FrozenGuy5 de0d93467e Adds alot of initialize() in lots of files 2017-11-11 20:58:15 +00:00
swindly b8dae82098 adds suicide_act()s 2017-11-10 18:23:01 -05:00
ShizCalev 179e653562 Adds icons for items with randomization (#32523)
* Adds icons for items with randomization

* Glowsticks

* added ?

* more question marks

* Loc
2017-11-10 00:23:10 -05:00
Emmett Gaines 825ab4def4 [512] The great \ref purge (#31824)
* The great \ref purge

* cleanup
2017-10-28 17:20:04 -04:00
Jordan Brown 8e434b7d96 Removes duplicate typecaches (#31883)
* Audits all typecache calls for performance gains

* Fix invalid var
2017-10-23 15:24:41 +02:00
YPOQ a1f58ef4c4 Composting plants/pills transfers all reagents (#31923) 2017-10-22 18:52:51 -04:00
ShizCalev 47270fe3bf Corrects soil description 2017-10-17 08:22:33 -05:00
vuonojenmustaturska 0616b8406e bottle sprite stuff 2017-10-15 23:59:54 -05:00
Onule c0484e14b0 Sunflower makeover, adds missing inhands sprites. (#31728)
* New sunflower sprite, added inhand sprites, first time messing with git

* Updates sunflower and variant's sprites, adds new growing stage sprites for sunflower variants, new inhands sprites.

* Made the leaves a bit higher. Das it
2017-10-15 16:33:36 -05:00
Tad Hardesty c1794bb402 Fix many instances of "the the"
All uses of "the [src]" have been fixed, as well as other bad string
interpolation directly adjacent to such uses.

In addition to its message, the circumstances under which the tracking
implant locator fails have been updated to use the correct define,
malfunctioning on CentCom rather than on the station.
2017-10-11 21:55:44 -07:00
Mercenaryblue 05e1f521e6 Added Banana Peels Inhand Sprites (#31551)
Added in-hand Banana Peels sprites.
Default, Mime, and Bluespace.
2017-10-11 20:41:27 -04:00
duncathan salt 454d16fe32 Minor refactor of how gas IDs are handled (#31528)
* gas IDs -> gas datum paths

* updates parse_gas_string() to handle both paths and IDs

* fixes compile errors

* fixes parse_gas_string() ignoring amounts of gas

* fixes roundstart jetpack runtimes

* fixes filters

* fixes map-edited filters

* fixes empty canister runtimes on initialization
2017-10-11 15:04:12 -04:00
Leo 0cd3f2ba4e Merge pull request #31497 from AnturK/cyberboss-pls
Fixes some tempremoves
2017-10-10 09:09:23 -03:00
Tad Hardesty 13f32a938b Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 21:06:46 +13:00
AnturK 87e8825dd4 Fixes some tempremoves 2017-10-09 14:20:17 +02:00
Jordan Brown b6d349e1d4 Remove drop_item, drop_item_v, put_in_hands_or_del (#31386) 2017-10-07 13:36:33 -04:00
Tad Hardesty 5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
Firecage ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00