Commit Graph

732 Commits

Author SHA1 Message Date
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
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
Firecage
2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
Jordan Brown
270504c569 newloc -> mapload 2017-10-01 09:47:32 -04:00
Jordan Brown
328ada6d2b Removes stray space 2017-10-01 09:46:58 -04:00
AnturK
6a0b84f772 This too 2017-10-01 13:26:38 +02:00
AnturK
ee49ba470c Fixes grown runtime spam 2017-10-01 13:25:09 +02:00
AnturK
423e76c8f1 Fixes some hardset dna misuse 2017-09-30 14:51:01 -05:00
Jordan Brown
4178c209f1 Configuration datum refactor (#30763)
* Configuration datum refactor

* More WIP

* New easier on the eyes format

* More WIP

* Finished config.txt

* Fucktons more WIP

* The end of conversion draws near...

* Add all this shit

* Done converting entries finally

* Hunting down compile errors

* More WIP

* MORE CONVERSIONS

* More WIP

* More WIP

* Oh shit only 90 errors this time!

* IT COMPILES!!!

* Fixes world start runtimes
2017-09-29 15:36:51 +13:00
shizcalev
4f5658cfbb Cleaned up some decimal values. 2017-09-14 12:50:06 -04:00
kingofkosmos
a479714b5f Adds missing span-endings (#30494)
* Adds missing </span>'s.

* ".name]" --> "]" and
"to_chat(GLOB.admins," --> "message_admins("
and one [name] --> [src]

* Earlier commit was a mistake, lesson learned

* Hopefully all is ok now.

* Revert "Hopefully all is ok now."

This reverts commit 3c95e41b4c13ce96469861e9a97453adf4b56826.

* Revert "Earlier commit was a mistake, lesson learned"

This reverts commit d611af1e4a76690453a7f9808b6e2c429b679f6c.

* Revert "".name]" --> "]" and"

This reverts commit d538b9efef2d7d8be9122bf5ceaf105055059bc6.

* message_admins fix
2017-09-11 14:09:53 +02:00
tortellinitony
224075694b Gets rid of manual overlay manipulation (#30454) 2017-09-06 23:38:24 -05:00
Joan Lung
e83d72219d Soft crit, except not terrible (#30262)
* Soft crit, except a little bit harder.

* tweak

* 👌

* why was this even in here

* no radios in critical

* fix that too

* keep to original logic

* not very smart, really

* tip: do nothing tgui-side that you can do code-side, because we can't do defines in tgui

* blood trail

* can't do blood trails

* how does this even work

* harsher slowdown and more obscured vision

* it really puts it into perspective; you're fucking dying.

* stat_attack

* stop fuckin whispering into radios or whatever it is you're doing

* more fixes

* fix

* fix

* fix the radio shit

* bikeshed?
2017-09-04 18:58:34 -05:00
pubby
4374ddf30c Bee fixes (#30386) 2017-09-04 16:57:21 -05:00
pubby
41d8b0409f Soil plot fixes (#30378)
* Make soil plots NODECONSTRUCT

* Removes the circuit from soil
2017-09-04 11:27:13 -05:00
Thunder12345
6f90706b49 It's oranges (#30158)
* It's oranges

* sweeps away the memes
2017-08-24 19:29:12 -05:00
Jordan Brown
41eed1ce22 Merge pull request #30079 2017-08-23 12:04:50 -04:00
ExcessiveUseOfCobblestone
9055e892f0 Alternative To Removing Kudzu Manufacturing (#30084)
* Update kudzu.dm

* Update spacevine.dm

* Update spacevine.dm

* b

* Removes Airlock nerf [why did this work anywho]

* Removes Spacewalking kudzu

* Eh, I'll do this myself
2017-08-23 12:03:51 -04:00
shizcalev
ffa5d9e388 Fixes missing inhands 2017-08-21 18:29:51 -04:00
oranges
a9ee524218 Merge pull request #29960 from pubby/weed
Fix spelling of "cannabis"
2017-08-18 13:18:55 +12:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00