Commit Graph

20289 Commits

Author SHA1 Message Date
Trilbyspaceclone
fda9883bae Update inducer.dm 2019-05-06 14:48:16 -04:00
Trilbyspaceclone
5e5c470dc9 Update all_nodes.dm 2019-05-05 06:51:10 -04:00
Trilbyspaceclone
7d310f407b Update inducer.dm 2019-05-05 06:50:22 -04:00
Trilbyspaceclone
cc34a8fa4e Update all_nodes.dm 2019-05-05 06:47:03 -04:00
Trilbyspaceclone
5904d1d281 Update power_designs.dm 2019-05-05 06:45:40 -04:00
Trilbyspaceclone
642cad2bb2 Update inducer.dm 2019-05-05 06:40:07 -04:00
Trilbyspaceclone
c618e73618 Add files via upload 2019-05-05 06:31:10 -04:00
Trilbyspaceclone
664c8145fe Delete tools.dmi 2019-05-05 06:26:37 -04:00
Trilbyspaceclone
b63c3d5301 Merge pull request #39 from Citadel-Station-13/master
updater
2019-05-05 06:25:23 -04:00
CitadelStationBot
c039043d0f Automatic changelog generation for PR #8317 [ci skip] 2019-05-05 01:18:38 -05:00
kevinz000
383cae2949 Merge pull request #8317 from deathride58/herewegoagain
[s] Clamps biogen amount to a sane amount
2019-05-04 23:18:36 -07:00
kevinz000
1b387eb5e3 Merge pull request #8314 from Poojawa/mawp
Mawp
2019-05-04 23:18:14 -07:00
CitadelStationBot
1480d53407 Automatic changelog generation for PR #8315 [ci skip] 2019-05-05 01:17:53 -05:00
kevinz000
1caa3ba720 Merge pull request #8315 from Trilbyspaceclone/patch-115
Maybe fixes laser carbine sprites
2019-05-04 23:17:51 -07:00
CitadelStationBot
9cc8ed4bba Automatic changelog generation for PR #8319 [ci skip] 2019-05-05 01:17:20 -05:00
kevinz000
d25a59f567 Merge pull request #8319 from BurgerLUA/Penis-Enlargement-Pills
Adds Penis Enlargement Pills
2019-05-04 23:17:18 -07:00
BurgerLua
1557c33008 Adds Penis Enlargement Pills 2019-05-02 14:55:04 -07:00
deathride58
7dd5e563b0 Clamps biogen amount to a sane amount 2019-05-02 00:21:38 -04:00
Trilbyspaceclone
831e450b3f Update weapon_designs.dm 2019-05-01 16:08:17 -04:00
Trilbyspaceclone
150db880de Update laser.dm 2019-05-01 16:07:11 -04:00
Trilbyspaceclone
fd251d3dd2 Update laser.dm 2019-05-01 15:15:29 -04:00
Poojawa
faeb4bc22d Mawp
Mawp
2019-05-01 00:58:19 -05: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