Commit Graph

20244 Commits

Author SHA1 Message Date
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
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
Trilbyspaceclone
f6bb8b6aef Update magweapon.dm 2019-04-28 22:33:58 -04:00
Trilbyspaceclone
9ff3918ffd Update magweapon.dm 2019-04-28 22:25:19 -04:00
Trilbyspaceclone
ad2cacb59e toys 2019-04-28 22:05:53 -04:00
Trilbyspaceclone
fb7a129ca5 Update magweapon.dm 2019-04-28 21:56: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
bec3cf8967 Update magweapon.dm 2019-04-28 21:24:45 -04:00
Trilbyspaceclone
8055d21c0c Update recharger.dm 2019-04-28 16:46:33 -04:00
Trilbyspaceclone
0fa3fb6aca Update magweapon.dm 2019-04-28 16:46:12 -04:00
BurgerLua
36fc30f7a7 fugg 2019-04-28 13:39:24 -07:00
BurgerLua
6021e80a8b Update penis.dm 2019-04-28 13:23:16 -07:00
Useroth
c59cb823bb Let's try like this. 2019-04-28 21:14:11 +02:00
Trilbyspaceclone
59226233f8 Update recharger.dm 2019-04-28 14:52:46 -04:00
Trilbyspaceclone
b7b4bf1a61 Update magweapon.dm 2019-04-28 14:51:53 -04:00
Useroth
cd5317d137 Fixed katana jaunt not working on dark tiles. 2019-04-28 15:49:00 +02:00
Useroth
7018372c5c Revert "Added myself to the admin list. Duh."
This reverts commit 41a0b802e8.
2019-04-28 15:48:02 +02:00
Trilbyspaceclone
15a1b2baeb Poojawa pointed this out 2019-04-27 18:56:40 -04:00
Trilbyspaceclone
aabba13648 Update shotgun.dm 2019-04-26 20:34:47 -04:00
Trilbyspaceclone
f1ca63fd36 Add files via upload 2019-04-26 20:33:49 -04:00
Trilbyspaceclone
5c88d7d8df Delete projectile.dmi 2019-04-26 20:32:55 -04:00
Useroth
41a0b802e8 Added myself to the admin list. Duh. 2019-04-26 17:01:30 +02:00
Trilbyspaceclone
b4bdc9bc1d Update laser.dm 2019-04-26 00:47:21 -04:00