kevinz000
|
68ef76e09a
|
Merge pull request #8432 from Ghommie/Ghommie-cit15
Buffs stunprods to not have a cooldown
|
2019-06-08 01:03:01 -07:00 |
|
kevinz000
|
c7f346a03c
|
Merge pull request #8442 from Trilbyspaceclone/patch-139
Makes soviet clothing no longer need to be hacked AND emaged
|
2019-06-08 01:02:21 -07:00 |
|
kevinz000
|
8c632bed6f
|
Merge pull request #8391 from Trilbyspaceclone/patch-132
Gives pod lava land ruin a autolathen
|
2019-06-08 01:00:41 -07:00 |
|
deathride58
|
1dde6b90ae
|
Merge pull request #8538 from dtfe3/dtfe3-hair-twintail
Hair - Long Twintails
|
2019-06-08 01:37:29 -04:00 |
|
Thalpy
|
84c3c104cd
|
Pointed out that a message could be misinterpreted as lewd.
|
2019-06-08 06:32:12 +01:00 |
|
deathride58
|
7fcb46e0f6
|
Merge pull request #8468 from Citadel-Station-13/kevinz000-patch-41
buffs disabler 20-->25 shots firerate 2.5/s --> 3.33/s speed 412.5-->471.5 pixels/s
|
2019-06-08 01:09:52 -04:00 |
|
deathride58
|
8bf5777844
|
Merge pull request #8474 from Citadel-Station-13/adrenal_nerf
Adrenal rebalancing/nerfing. Again. And a very slight meth buff.
|
2019-06-08 01:07:56 -04:00 |
|
Fermi
|
3bb1a8dd00
|
OOPS.
|
2019-06-08 02:19:39 +01:00 |
|
Fermi
|
b6788cdd64
|
Updated projectile sprite.
|
2019-06-08 01:45:32 +01:00 |
|
Fermi
|
42d0ab4825
|
Comment cleanup.
|
2019-06-08 01:31:21 +01:00 |
|
Fermi
|
9fcbac0323
|
Lil flavour.
|
2019-06-08 01:23:57 +01:00 |
|
Fermi
|
c6c98b539d
|
Minor bug fix.
|
2019-06-08 01:22:43 +01:00 |
|
Fermi
|
f44b9048af
|
Added to vendors/tech.
|
2019-06-08 01:00:51 +01:00 |
|
Fermi
|
65b218d4c3
|
Spritework.
|
2019-06-08 00:31:14 +01:00 |
|
Trilbyspaceclone
|
bc6b967fb2
|
Update paperplane.dm
|
2019-06-07 18:34:30 -04:00 |
|
Trilbyspaceclone
|
79a456a0ac
|
Update carbon_defense.dm
|
2019-06-07 18:29:42 -04:00 |
|
SkullyRoberts
|
5a9269db73
|
removed duplicate hides_bulges
|
2019-06-07 12:56:25 -04:00 |
|
SkullyRoberts
|
1a5c487e22
|
Ported the nudity permit from RP and made it a loadout option
|
2019-06-07 12:37:37 -04:00 |
|
deathride58
|
aa53cc9ea9
|
Merge branch 'master' into fuckatmos
|
2019-06-07 04:38:47 -04:00 |
|
Ghommie
|
56be73f7e0
|
Lord Travis Hath Spoken.
|
2019-06-07 07:44:33 +02:00 |
|
Ghommie
|
92e925f1f7
|
Stuff to fix, fools to blame.
|
2019-06-07 07:14:24 +02:00 |
|
Ghommie
|
4d5332346e
|
Compiling was too slow.
|
2019-06-07 06:37:03 +02:00 |
|
Ghommie
|
7aac9e6280
|
Updates reagents a bit.
|
2019-06-07 06:27:04 +02:00 |
|
Poojawa
|
38dbdf1a48
|
Gives Ninjas back their Weeb speech modification
|
2019-06-06 21:55:35 -05:00 |
|
Ghommie
|
455332a717
|
movin back to the core when selecting a new display.
|
2019-06-07 04:20:15 +02:00 |
|
Ghommie
|
a6fcac55d4
|
Makes it compile.
|
2019-06-07 04:05:27 +02:00 |
|
Ghommie
|
0b53df47de
|
Enough clowning around.
|
2019-06-07 03:22:26 +02:00 |
|
BlackMajor
|
21fd11718a
|
Bundled glue in with compression kit PR
|
2019-06-07 12:00:06 +12:00 |
|
Poojawa
|
67eb76b360
|
clarifies a few things
|
2019-06-06 18:56:26 -05:00 |
|
Ghommie
|
5a69499927
|
Hol up, unrelated PR time, atomization.
|
2019-06-07 01:32:15 +02:00 |
|
Fermi
|
2888e1b30b
|
Dartgun functions as intended.
|
2019-06-07 00:12:11 +01:00 |
|
Ghommie
|
ef7fb47e17
|
port fixaloo.
|
2019-06-07 00:41:19 +02:00 |
|
Fermi
|
1a42c017ac
|
DEBUG
|
2019-06-06 23:23:53 +01:00 |
|
Ghommie
|
bdaab020f7
|
ports a fix.
|
2019-06-07 00:20:04 +02:00 |
|
Trilbyspaceclone
|
a7fe2ca0ff
|
paper work icons
|
2019-06-06 16:03:24 -04:00 |
|
Trilbyspaceclone
|
6fd83df81f
|
Update recipes.dm
|
2019-06-06 16:00:02 -04:00 |
|
Trilbyspaceclone
|
7f35a15020
|
Update packs.dm
|
2019-06-06 15:58:13 -04:00 |
|
Trilbyspaceclone
|
e2a3b855b8
|
Update order.dm
|
2019-06-06 15:56:27 -04:00 |
|
Trilbyspaceclone
|
4ef2b15c69
|
Update manifest.dm
|
2019-06-06 15:51:37 -04:00 |
|
Trilbyspaceclone
|
01e56cc00d
|
garmmer
|
2019-06-06 14:52:52 -04:00 |
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
kevinz000
|
31a942a63a
|
Merge pull request #8534 from dtfe3/dtfe3-pink-panties
Pink Panties
|
2019-06-06 06:52:57 -07:00 |
|
Ghommie
|
44358e054a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29
|
2019-06-06 15:24:31 +02:00 |
|
Ghommie
|
0e630680ba
|
forgot to pull from upstream. One second.
|
2019-06-06 15:20:27 +02:00 |
|
Trilbyspaceclone
|
5e68db7836
|
local files have commas, but I forgot to save
|
2019-06-05 22:22:50 -04:00 |
|
Trilbyspaceclone
|
3e98ed9553
|
Update packs.dm
|
2019-06-05 20:41:59 -04:00 |
|
Trilbyspaceclone
|
1b463c18b3
|
Update snacks_sandwichtoast.dm
|
2019-06-05 20:14:48 -04:00 |
|
Trilbyspaceclone
|
a9ded7a3eb
|
Add files via upload
|
2019-06-05 20:10:07 -04:00 |
|
Trilbyspaceclone
|
e5b538af71
|
Update recipes_frozen.dm
|
2019-06-05 20:09:21 -04:00 |
|
Trilbyspaceclone
|
762c509315
|
Update craft.dm
|
2019-06-05 20:07:25 -04:00 |
|