Commit Graph

12588 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
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
kevinz000
1caa3ba720 Merge pull request #8315 from Trilbyspaceclone/patch-115
Maybe fixes laser carbine sprites
2019-05-04 23:17:51 -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
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
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
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
cd5317d137 Fixed katana jaunt not working on dark tiles. 2019-04-28 15:49:00 +02:00
Trilbyspaceclone
aabba13648 Update shotgun.dm 2019-04-26 20:34:47 -04:00
Trilbyspaceclone
b4bdc9bc1d Update laser.dm 2019-04-26 00:47:21 -04:00
Trilbyspaceclone
997df62724 Update cell.dm 2019-04-26 00:46:09 -04:00
Trilbyspaceclone
fdbaafa5a9 Update weapon_designs.dm 2019-04-26 00:45:17 -04:00
Trilbyspaceclone
c033210577 Update all_nodes.dm 2019-04-26 00:43:37 -04:00
Trilbyspaceclone
70c5c47490 Lets not mistakenly nerf hop please? 2019-04-25 23:51:09 -04:00
Trilbyspaceclone
39fcf27beb Update jobs.dm 2019-04-25 23:48:12 -04:00
BurgerLua
b44ac0dd74 Reorganizes accessory files, seperates underwear tops from bottoms, and removes gendered clothing. 2019-04-25 18:11:12 -07:00
Trilbyspaceclone
33e3df8157 What in the hell? 2019-04-25 20:46:39 -04:00