Commit Graph

177 Commits

Author SHA1 Message Date
Ordonis 3a1cfe9f59 Fixes #35814 (#35823)
Ree container changes ruined my neat solution now it's less neat
reeeeeeeeeeee
2018-02-20 17:28:12 -06:00
fludd12 0d03e90e9f Fixes mushroom bowls (#35740)
* Fixes mushroom bowls

Made the mushroom bowl a subtype of the normal bowl, and deleted a
duplicate definition.

Also, adds custom soup and salad support for the mushroom bowls.

Fixes #32471

* Remove a dangling return
2018-02-19 22:08:09 -06:00
CitadelStationBot e3691b8857 [MIRROR] Fixes immersion, fried eggs now no longer requires boiled eggs (#5582)
* Update recipes_egg.dm (#35769)

* Fixes immersion, fried eggs now no longer requires boiled eggs
2018-02-18 19:52:54 -06:00
fludd12 954bb7330e Sake! (#5538)
* Sake!

🆑 Fel and LeonDuvall
add: You can now drink sake! Can be found in the bar, or made with rice
and sugar.
/🆑

Sprites and idea courtesy of LeonDuvall.
Can be made with 15u rice and 5u sugar at 400k.

* Does the thing

Modularization of vending machines would require a lot more effort than
is remotely worth for such a simple change. Fortunately, not a lot of
new alcohols are added to it often, so it should be fine.
2018-02-18 19:26:55 -06:00
Ordonis 1094e5b69e Newliquors (#35581)
* Adds a few new liqueurs and cocktails

How the fuck in THIS game of all games do we not have Triple Sec.
SERIOUSLY.

* Well there goes a one commit clean PR rip me

reeeeee

* Adds sounds, fixes colors

* Fixes recipies giving eggnog

Don't ask

* Adds space where space should be

* Travis stop stalling reeeeeee

* Fixes spelling mistakes

* Adds some health benefits to sec drinks.

Quadruple sec is mild, but easy to make; quintuple sec is STRONG but
more difficult.

* Fixes merge conflict annoyance

* FUCK

* Updates boozepwr of Quadruple/Quintuple sec

If someone ever adds sex on the beach as a cocktail, I fully expect them
to add in Sex-tuple Sec as well.

* Makes clowntears reagent explicit within food_reagents

Removed hacky solution, introduced better one
2018-02-18 11:33:37 -06:00
ShizCalev 98bbfb8709 [s]Fixes writing bugs/exploits 2018-02-15 16:10:03 -06:00
deathride58 4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045
TG Sync #4985279348672983476
2018-02-14 04:11:44 +00:00
vuonojenmustaturska 6bdb3ad4c0 Merge pull request #35594 from praisenarsie/patch-30
Fixes rat kebabs
2018-02-13 17:15:31 -06:00
oranges e6ace7bc56 Adds heart-shaped boxes of chocolate to the valentines event 2018-02-13 14:12:32 -06:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
ShizCalev f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
Jordan Brown bd0b5c2eb5 Merge pull request #35479 from Cruix/chem_collisions
Fixed chemical recipe conflicts
2018-02-10 11:04:34 -06:00
Jordan Brown 5082056ef9 Merge pull request #35452 from 81Denton/crush-a-can-for-jay-owen
Removes grind_results from empty soda cans
2018-02-09 12:48:59 -06:00
Ashe Higgs cf66c8c79c Adds anomalous, infinitely-regenerating pizza boxes as a very rare item from pizza crates 2018-02-07 04:52:27 -06:00
CitadelStationBot 7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
CitadelStationBot 43ee34838f [MIRROR] Adds pineapples to botany, and Hawaiian pizza (#5260)
* Adds pineapples to botany, and Hawaiian pizza

* Update packs.dm
2018-02-05 03:00:22 -06:00
CitadelStationBot ee0245c79f [MIRROR] Tomatoes and other foods found to have girl parts; removed from vegetable piles (#5226)
* Merge pull request #35122 from CosmicScientist/you-say-tomaetoe-i-say-tomato-youre-wrong

Tomatoes and other foods found to have girl parts; removed from vegetable piles

* Tomatoes and other foods found to have girl parts; removed from vegetable piles
2018-02-04 22:07:17 -06:00
Poojawa 03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
uraniummeltdown f868cb146f alt-click on microwave to cook (#34992) 2018-01-28 18:29:27 -06:00
vuonojenmustaturska f005e65ab0 Merge pull request #35018 from DaxDupont/rice-pudding
Rice (pudding) is no longer a salad.
2018-01-28 11:34:14 -06:00
Jordan Brown 2af5ee4cc5 Merge pull request #34904 from ShizCalev/pancake-length
fixes pancake runtimes
2018-01-26 03:00:24 -06:00
MrDoomBringer 4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
Jordan Brown 0042517af9 Merge pull request #34649 from ShizCalev/spider-nutriment-typo
Fixes spider reagents typo
2018-01-20 09:48:44 -06:00
Jordan Brown 93cc10b7a0 Merge pull request #34627 from ShizCalev/pie-runtime
Fixes pie runtime
2018-01-19 08:58:37 -06:00
Jordan Brown 594e8c8e6d Merge pull request #34553 from ShizCalev/abstract-transfertoloc
Fixes being able to place abstract items in fridges & chem dispensers
2018-01-18 16:48:32 -06:00
deathride58 d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
oranges 6012a5c6eb Fix bug with smashing bottles on throw (#34077)
The passed in variable is a datum, not a mob

Corrects the description for another instance of this
2018-01-05 06:01:44 -06:00
deathride58 5dc3f29ad4 modules - E to L 2018-01-04 00:53:38 -05:00
Jordan Brown 159fe41ab8 Merge pull request #33948 from ShizCalev/abstract-frying
stops frying abstract or nodrop items
2017-12-31 10:01:38 -06:00
LetterJay 3973b368de Merge branch 'master' into upstream-merge-33470 2017-12-21 03:24:03 -06:00
LetterJay 408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
LetterJay 5e0ddfce60 Update drinks.dm 2017-12-19 17:15:37 -06:00
ACCount 522b8383d8 [READY]Refactors reagent container types 2017-12-18 22:54:51 -06:00
LetterJay 6e5bd180fa Merge pull request #4427 from Citadel-Station-13/upstream-merge-33598
[MIRROR] Microwave sound loops now stop in all cases where it should, such as being interrupted or breaking
2017-12-18 15:26:42 -06:00
Ashe Higgs 5b107f3922 Microwave sound loops now stop in all cases where it should, such as being interrupted or breaking (#33598)
* Stops microwave sound loops when it should

* rogue sound!
2017-12-17 16:16:17 -06:00
Emmett Gaines f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
Ashe Higgs 2aef00daf0 All-In-One grinder results are now defined by type, not by huge lists 2017-12-14 15:48:39 -06:00
vuonojenmustaturska 7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
CitadelStationBot cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
deathride58 c116054efc Merge pull request #4256 from Citadel-Station-13/upstream-merge-33361
[MIRROR] Removes juicers
2017-12-10 23:49:41 +00:00
deathride58 e46e6dcd1a Delete juicer.dm 2017-12-10 18:06:19 -05:00
deathride58 4600a6eb87 Update drinks.dm 2017-12-08 14:07:33 -05:00
oranges 10d50dd283 Fixes mugs being called "broken bottles" 2017-12-08 10:34:27 -06:00
Emmett Gaines 8c11252d93 butterdogs (#33002) 2017-11-25 15:35:21 -06:00
deathride58 14ce7c8118 Merge pull request #4101 from Citadel-Station-13/upstream-merge-32994
[MIRROR] Updates some item drops to use drop_location()
2017-11-25 05:53:16 +00:00
deathride58 44fb7ccdb7 Update drinkingglass.dm 2017-11-24 18:00:44 -05:00
ShizCalev 12aa356f10 Updates some item drops to use drop_location() 2017-11-24 12:59:33 -06:00
oranges c43591982a Refactor on_reagent_change to pass through the change type 2017-11-24 12:59:09 -06:00