Commit Graph

13133 Commits

Author SHA1 Message Date
BurgerLua 22c0c9baec Slurring Fix 2019-04-30 21:29:28 -07:00
BurgerLua 4aaab992f5 Removed frost oil and spray tan, deep fried items now no longer delete themselves when consumed. 2019-04-30 11:53:48 -07:00
kevinz000 534b5f0287 Merge pull request #8309 from Trilbyspaceclone/Food-5
Better sushi crafting, and tuna based food - Works addtion
2019-04-30 05:42:30 -07:00
kevinz000 7466f48674 Merge pull request #8288 from BurgerLUA/Accesssssssssssss
Accessory Clothing Mayhem, or how I lost my fucking sanity making this PR.
2019-04-30 05:37:02 -07:00
kevinz000 7fe7b2d30f Merge pull request #8286 from BurgerLUA/AlcoholTweaks
Tweaks how Slurring works and makes slurring directly proportional to drunkeness.
2019-04-30 05:32:20 -07:00
kevinz000 cbc0607086 Merge pull request #8290 from Trilbyspaceclone/Laser_gun_adv
Readds Laser carbines.
2019-04-30 05:31:33 -07:00
kevinz000 d4721e876e Merge pull request #8294 from Trilbyspaceclone/shotgun_sprites
Shotgun sprites options - Fract Request
2019-04-30 05:30:00 -07:00
kevinz000 709e3375ac Merge pull request #8283 from BurgerLUA/NoMoreOfThisShit
Adds a new trait that makes you immune* to Crocin and Hexacrocin
2019-04-30 05:28:55 -07:00
kevinz000 218fd09102 Merge pull request #8301 from Trilbyspaceclone/hell
[Ready] Mag gun rework MK II
2019-04-30 05:24:16 -07:00
kevinz000 970dc85b62 Merge pull request #8289 from Trilbyspaceclone/patch-111
Buffs cap hat and HOP hat
2019-04-30 05:18:52 -07:00
kevinz000 7c1d7b60d0 Merge pull request #8287 from Trilbyspaceclone/Lock_and_key
Lockable Collars - Requested by Frack
2019-04-30 05:18:14 -07:00
Trilbyspaceclone bf36beb395 Update traumas.dm 2019-04-29 22:20:01 -04:00
Trilbyspaceclone 0d868bc660 Rename snacks_sushi.dm to recipes_sushi.dm 2019-04-29 18:52:04 -04:00
Trilbyspaceclone ee007ecae0 Update snacks_sushi.dm 2019-04-29 18:26:19 -04:00
Trilbyspaceclone 482ee83621 Update recipes_meat.dm 2019-04-29 18:22:31 -04:00
Trilbyspaceclone c03febe17e THATS WHY 2019-04-29 18:20:38 -04:00
Trilbyspaceclone fd5554dc21 Update recipes_meat.dm 2019-04-29 18:17:53 -04:00
Trilbyspaceclone 0d099cb627 Update recipes_meat.dm 2019-04-29 18:13:42 -04:00
Trilbyspaceclone adc6ef506e Update recipes_meat.dm 2019-04-29 17:58:17 -04:00
Trilbyspaceclone 862512fba7 Update recipes_sandwich.dm 2019-04-29 17:53:44 -04:00
Trilbyspaceclone 5737a4e951 Add files via upload 2019-04-29 17:52:28 -04:00
Trilbyspaceclone 555359f873 Update snacks_sandwichtoast.dm 2019-04-29 17:51:53 -04:00
Trilbyspaceclone 25df517ad5 Update construction.dm 2019-04-29 17:48:26 -04:00
Trilbyspaceclone 2a33dcd333 Add files via upload 2019-04-29 17:45:48 -04:00
kevinz000 6e7e385de0 Update toxin_reagents.dm 2019-04-29 04:00:06 -07:00
Poojawa 72751a9efc Sorts and cleans up some sprites
adds guilmon things to lizards as well, since they didn't have it I guess
2019-04-29 04:33:23 -05:00
Poojawa 3fd4e9ac22 Fixes medical helmet muzzle leak
tbh I though it'd look nice through the glass but HAHA FUCK BYOND
2019-04-29 04:31:33 -05:00
Poojawa 55c85175e7 I can english to potatoe 2019-04-29 02:41:15 -05:00
Poojawa 29af85a0ae Brings NTPR to the nice discord bot 2019-04-29 02:37:01 -05:00
BurgerLua 0d7c4c89d3 actually lets not have this 2019-04-28 19:47:12 -07:00
BurgerLua 5357724de7 Rebalanced vent clog events. 2019-04-28 19:44:50 -07:00
Trilbyspaceclone 3eeafbb975 Merge branch 'master' into hell 2019-04-28 21:54:55 -04:00
Trilbyspaceclone a9aa855305 Update recharger.dm 2019-04-28 21:25:18 -04:00
Trilbyspaceclone 8055d21c0c Update recharger.dm 2019-04-28 16:46:33 -04:00
Trilbyspaceclone 59226233f8 Update recharger.dm 2019-04-28 14:52:46 -04:00
Useroth 5d8cf0cabe Let's give adrenals the one more small touch of love. 2019-04-28 16:13:07 +02:00
Useroth cd5317d137 Fixed katana jaunt not working on dark tiles. 2019-04-28 15:49:00 +02:00
kevinz000 e9ce738879 Update toxin_reagents.dm 2019-04-28 03:44:01 -07:00
Useroth 8ab82e0853 Fixed two leftovers from a feature that I will do in another PR. 2019-04-28 06:23:36 +02:00
Useroth 56b2e7150c Back to the point of entry. 2019-04-28 06:21:03 +02:00
Trilbyspaceclone 32b2342e4a ouch! 2019-04-27 18:48:47 -04:00
Useroth 41a8177f34 Adjustments v2. 2019-04-27 13:53:04 +02:00
Useroth c1ffffa4f1 Adjustments. 2019-04-27 13:50:23 +02:00
Trilbyspaceclone bd5e8241d6 Update syndicate.dm 2019-04-26 22:50:23 -04:00
Trilbyspaceclone 080488ed61 Update misc_designs.dm 2019-04-26 22:32:06 -04:00
Trilbyspaceclone 192b3ebc6c >_< WOOPS 2019-04-26 22:25:48 -04:00
Trilbyspaceclone 6b0e533b69 Update smelting_designs.dm 2019-04-26 22:20:42 -04:00
Trilbyspaceclone 28403a55f4 Update misc_designs.dm 2019-04-26 22:18:29 -04:00
Trilbyspaceclone d2b45df30f Update medical_designs.dm 2019-04-26 22:16:35 -04:00
Trilbyspaceclone 2facc84975 Update machine_designs.dm 2019-04-26 22:14:32 -04:00