Commit Graph

7708 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
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
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
2a33dcd333 Add files via upload 2019-04-29 17:45:48 -04: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
fcda4c0fbb Update _neck.dm 2019-04-25 20:40:48 -04:00
BurgerLua
569a92485f Removed slurring being 0.15 as it was a little extreme. 2019-04-25 12:09:45 -07:00
BurgerLua
75816477a5 Slurring now related to your drunkenness level. 2019-04-25 12:09:10 -07:00
BurgerLua
fd19d67cc2 "Improves" how slurring works, and adjusts how fast you recover from slurring. 2019-04-25 11:57:02 -07:00
kevinz000
6646d39c89 Merge pull request #8277 from BurgerLUA/NoRaceChange
Significantly Reworks the Wizard Transformation Event
2019-04-25 04:34:59 -07:00
kevinz000
a23b999cc3 Merge pull request #8261 from Trilbyspaceclone/patch-101
Makes all mechs sell for legit price
2019-04-25 04:20:02 -07:00
kevinz000
70bb99410e Merge pull request #8264 from Trilbyspaceclone/patch-102
Reblances miner vender suit vouch and more
2019-04-25 04:19:35 -07:00
kevinz000
6ce3a0150f Merge pull request #8242 from Trilbyspaceclone/patch-99
Give some blob things basic armor
2019-04-25 04:18:21 -07:00
BurgerLua
b0a93cf790 retweaked the event instead of removing it 2019-04-23 11:51:00 -07:00
Trilbyspaceclone
ff29ade943 Hairly request 2019-04-23 12:09:58 -04:00
Trilbyspaceclone
31f3a16777 *No gps* 2019-04-23 02:43:23 -04:00
Trilbyspaceclone
dbdd37430a Kev requests... 2019-04-23 02:42:18 -04:00
Trilbyspaceclone
1aa312822a Sure 2019-04-23 02:34:14 -04:00
Trilbyspaceclone
415461d736 Forgot bomb armor 2019-04-23 02:32:07 -04:00
Trilbyspaceclone
073684b7bc As Kev requested 2019-04-23 02:30:55 -04:00
kevinz000
64202b1444 Merge pull request #8247 from Poojawa/custom-race
Custom Species names
2019-04-22 21:41:31 -07:00
kevinz000
8b54d33286 Merge pull request #8215 from Trilbyspaceclone/Sush
[Ready] Sushi!
2019-04-22 21:40:28 -07:00
kevinz000
6892e8d01e Merge pull request #8265 from Trilbyspaceclone/patch-103
Reblances goliath stun.
2019-04-22 21:38:33 -07:00
kevinz000
333f758e30 Merge pull request #8105 from Trilbyspaceclone/patch-76
[Ready] Makes transformation slings have a loundess of 2 factor
2019-04-22 21:34:50 -07:00
kevinz000
6be4b7b969 Merge pull request #8260 from Trilbyspaceclone/cakes
4 more cakes!
2019-04-22 21:32:15 -07:00
Poojawa
fe1692eef3 t a b 2019-04-21 01:57:12 -05:00
Poojawa
b524c6741d double checking my work 2019-04-21 01:56:45 -05:00
Poojawa
df057544f2 Merge branch 'master' into screaming 2019-04-20 23:33:23 -05:00