Commit Graph

20268 Commits

Author SHA1 Message Date
Trilbyspaceclone fd251d3dd2 Update laser.dm 2019-05-01 15:15:29 -04: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
CitadelStationBot 6168d615ac Automatic changelog generation for PR #8274 [ci skip] 2019-04-30 07:38:44 -05:00
kevinz000 a5799e8883 Merge pull request #8274 from BurgerLUA/CogFluff
Increased the spawn area size of the City of Cogs
2019-04-30 05:38:42 -07:00
CitadelStationBot 3b0ea2e293 Automatic changelog generation for PR #8288 [ci skip] 2019-04-30 07:37:05 -05: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
CitadelStationBot ea9e2a7d14 Automatic changelog generation for PR #8286 [ci skip] 2019-04-30 07:32:23 -05: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
CitadelStationBot 52cff725c4 Automatic changelog generation for PR #8290 [ci skip] 2019-04-30 07:31:36 -05:00
kevinz000 cbc0607086 Merge pull request #8290 from Trilbyspaceclone/Laser_gun_adv
Readds Laser carbines.
2019-04-30 05:31:33 -07:00
CitadelStationBot 1d69ac1672 Automatic changelog generation for PR #8294 [ci skip] 2019-04-30 07:30:03 -05:00
kevinz000 d4721e876e Merge pull request #8294 from Trilbyspaceclone/shotgun_sprites
Shotgun sprites options - Fract Request
2019-04-30 05:30:00 -07:00
CitadelStationBot 2661b08d28 Automatic changelog generation for PR #8283 [ci skip] 2019-04-30 07:28:58 -05: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
CitadelStationBot 202d901c25 Automatic changelog generation for PR #8301 [ci skip] 2019-04-30 07:24:19 -05:00
kevinz000 218fd09102 Merge pull request #8301 from Trilbyspaceclone/hell
[Ready] Mag gun rework MK II
2019-04-30 05:24:16 -07:00
CitadelStationBot 5802c75389 Automatic changelog generation for PR #8289 [ci skip] 2019-04-30 07:18:55 -05: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
CitadelStationBot 8cf8d87658 Automatic changelog generation for PR #8287 [ci skip] 2019-04-30 07:18:17 -05: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
CitadelStationBot e77188d461 Automatic changelog generation for PR #8302 [ci skip] 2019-04-30 07:14:13 -05:00
kevinz000 05b4854441 Merge pull request #8302 from BurgerLUA/PenisFix
Update penis.dm
2019-04-30 05:14:10 -07:00
kevinz000 397d85cdd8 Merge pull request #8300 from Useroth/jaunt-fix
Fixed the jaunt in ninja's katana.
2019-04-30 05:11:01 -07: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 bf9f9dcac3 Update tgstation.dme 2019-04-29 17:47:15 -04:00
Trilbyspaceclone 2a33dcd333 Add files via upload 2019-04-29 17:45:48 -04:00
Trilbyspaceclone 1a8a699445 Add files via upload 2019-04-29 17:44:32 -04:00
Trilbyspaceclone 079dc70dc2 Delete food.dmi 2019-04-29 17:44:05 -04:00
Trilbyspaceclone b0fe41ea96 Merge pull request #36 from Citadel-Station-13/master
updated
2019-04-29 17:38:30 -04:00
Trilbyspaceclone 60a9544a6b Update magweapon_energy.dm 2019-04-29 00:19:47 -04:00
Trilbyspaceclone 4492e60a9f typo 2019-04-29 00:02:53 -04:00
Trilbyspaceclone 5430454c73 Update magweapon.dm 2019-04-28 23:59:29 -04:00
Trilbyspaceclone d136d95743 Update magweapon.dm 2019-04-28 23:56:39 -04:00
Trilbyspaceclone b51751dfa8 Update magweapon_energy.dm 2019-04-28 23:38:34 -04:00
Trilbyspaceclone c5f3f67824 Update magweapon.dm 2019-04-28 23:33:31 -04:00
Trilbyspaceclone 514e15ee6c Update magweapon.dm 2019-04-28 23:32:38 -04:00
Useroth e51cdf98b2 Fixed the calibers up. 2019-04-29 04:58:26 +02:00
Trilbyspaceclone a52dab3e00 Update tgstation.dme 2019-04-28 22:47:55 -04:00
Trilbyspaceclone 22912832d7 Create magweapon_energy.dm 2019-04-28 22:46:50 -04:00
Trilbyspaceclone bc251b59aa Update magweapon.dm 2019-04-28 22:43:01 -04:00