nik707
|
12a69dcee5
|
Merge pull request #9574 from r4d6/patch-4
Add departemental Winter Coats to loadout
|
2019-11-05 13:52:48 -06:00 |
|
r4d6
|
0114b7fbe2
|
Comment out Sec coat
|
2019-11-03 16:51:07 -05:00 |
|
kevinz000
|
d9c38d0589
|
Merge pull request #8948 from Ghommie/Ghommie-cit156
Cleaning up the arousal module.
|
2019-10-31 17:27:03 -07:00 |
|
kevinz000
|
b172c5f691
|
Merge pull request #9501 from deathride58/stronksecborgs
Borg buffs - Allows jaws to incapacitate, gives secborg a taser, and more! (wall of text in desc)
|
2019-10-29 21:29:12 -07:00 |
|
kevinz000
|
bc3dd51db3
|
Merge pull request #9626 from Ghommie/Ghommie-cit278
Unmodularize space kiwis and banana spiders.
|
2019-10-29 21:21:14 -07:00 |
|
BlackMajor
|
6a7a121d56
|
Merge pull request #8856 from Citadel-Station-13/magrifles_again
Security Gun Rebalancing Electric Boogaloo - overhauls magrifles/magpistols, burst fire autorifles, nerfs laser carbines, resprites energy guns
|
2019-10-28 16:47:02 +13:00 |
|
deathride58
|
2c017b1f86
|
Merge pull request #9633 from Citadel-Station-13/onionneck
onion necklace
|
2019-10-27 20:43:01 -04:00 |
|
Jay
|
9d830610bb
|
onion necklace
|
2019-10-27 11:52:38 -05:00 |
|
Ghommie
|
bf92aa2ffb
|
Unmodularize MkII hyposprays and other reagent items sprites.
|
2019-10-26 19:14:28 +02:00 |
|
Ghommie
|
c0130467db
|
Unmodularize space kiwis and banana spiders.
|
2019-10-26 18:15:02 +02:00 |
|
deathride58
|
be4d694080
|
Merge pull request #9329 from Citadel-Station-13/kevinz000-patch-87
makes sprinting take more stamina when buffer is empty to compensate for added regen
|
2019-10-25 23:15:11 -04:00 |
|
kevinz000
|
49e52eee05
|
Merge pull request #9603 from Ghommie/Ghommie-cit267
Unmodularize lavaknights and emags.
|
2019-10-25 20:12:35 -07:00 |
|
kevinz000
|
275ecbf468
|
Merge pull request #9604 from Ghommie/Ghommie-cit268
Unmodularize job types
|
2019-10-25 20:10:39 -07:00 |
|
kevinz000
|
4eca1ca5ad
|
Merge pull request #9605 from Ghommie/Ghommie-cit269
Unmodularize vox sounds
|
2019-10-25 20:09:52 -07:00 |
|
kevinz000
|
8b22c95479
|
Merge pull request #9606 from Ghommie/Ghommie-cit270
Unmodularize research.
|
2019-10-25 20:09:26 -07:00 |
|
kevinz000
|
9b7b2ce0b2
|
Merge pull request #9607 from Ghommie/Ghommie-cit271
Unmodularize events
|
2019-10-25 20:07:48 -07:00 |
|
Ghommie
|
ce0ba51b61
|
Fixing schlongs and death.
|
2019-10-25 12:52:32 +02:00 |
|
Ghommie
|
79c3700d25
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-25 12:42:28 +02:00 |
|
kevinz000
|
02a1aaea34
|
Merge pull request #9548 from Ghommie/Ghommie-cit251
Fixing radio emotes conflict with drunk memes.
|
2019-10-24 18:48:33 -07:00 |
|
kevinz000
|
2ae111eaf0
|
Merge pull request #9587 from Ghommie/Ghommie-cit258
Porting components updates and fixing phantom thief component.
|
2019-10-24 18:38:39 -07:00 |
|
kevinz000
|
9fd3ef7801
|
Merge branch 'magrifles_again' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into magrifles_again
|
2019-10-24 18:36:04 -07:00 |
|
kevinz000
|
31f9ed9665
|
fixes
|
2019-10-24 15:31:45 -07:00 |
|
Ghommie
|
6fbe7f9086
|
unmodularize events
|
2019-10-24 23:41:31 +02:00 |
|
Ghommie
|
6f19899dd2
|
Unmodularize research.
|
2019-10-24 23:28:15 +02:00 |
|
Ghommie
|
0da6ae549f
|
Unmodularize vox sounds
|
2019-10-24 23:02:21 +02:00 |
|
Ghommie
|
2a07bf95d8
|
Unmodularize job types
|
2019-10-24 22:44:40 +02:00 |
|
Ghommie
|
f01b5c853f
|
Unmodularize lavaknights.
|
2019-10-24 22:08:36 +02:00 |
|
Ghommie
|
a50606bb67
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259
|
2019-10-24 10:10:07 +02:00 |
|
Ghommie
|
4c8d7023c5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258
|
2019-10-24 09:50:20 +02:00 |
|
kevinz000
|
9d78d8a259
|
Merge branch 'master' into magrifles_again
|
2019-10-23 17:57:19 -07:00 |
|
deathride58
|
f85f110baa
|
Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
|
2019-10-23 20:54:55 -04:00 |
|
Ghommie
|
e1928a18f1
|
Porting GetComponent macros removal, and some related changes.
|
2019-10-23 15:04:28 +02:00 |
|
Ghommie
|
fc1f10c97f
|
Porting components updates and fixing phantom thief component.
|
2019-10-23 13:01:31 +02:00 |
|
r4d6
|
cdb9d40bae
|
Add departemental Winter Coats to loadout
|
2019-10-22 14:38:09 -04:00 |
|
kevinz000
|
f96e1bbe33
|
lmao
|
2019-10-22 01:59:45 -07:00 |
|
Poojawa
|
6fc750dca0
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-21 19:13:19 -05:00 |
|
kevinz000
|
1d649c27de
|
Update robot_movement.dm
|
2019-10-21 14:38:38 -07:00 |
|
kevinz000
|
9e63413911
|
Merge pull request #9466 from deathride58/yawnborgs
Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert)
|
2019-10-21 01:04:34 -07:00 |
|
kevinz000
|
838575da50
|
Merge pull request #9503 from deathride58/tasernerf
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
|
2019-10-21 00:59:58 -07:00 |
|
kevinz000
|
95b81b5938
|
fix
|
2019-10-21 00:55:15 -07:00 |
|
kevinz000
|
c6c2a703e5
|
Merge remote-tracking branch 'origin/master' into magrifles_again
|
2019-10-21 00:47:03 -07:00 |
|
Ghommie
|
7e9298d5ac
|
Fixing radio emotes conflict with drunk memes.
|
2019-10-20 12:21:21 +02:00 |
|
kevinz000
|
c59f15a8bc
|
Merge pull request #9529 from BlackMajor/Yeet
Syndicate paper masks no longer work in pockets
|
2019-10-19 19:53:40 -07:00 |
|
Poojawa
|
ffeae20daa
|
Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods
|
2019-10-18 06:01:52 -05:00 |
|
BlackMajor
|
d39897b9ad
|
Update phantomthief.dm
|
2019-10-18 23:34:31 +13:00 |
|
kevinz000
|
5e049bc64a
|
Merge pull request #9514 from Linzolle/kevin-has-a-foot-fetish
foot fetish content for kevin (ankle coverings)
|
2019-10-17 12:49:08 -07:00 |
|
kevinz000
|
a7a238eafd
|
Merge pull request #9504 from Poojawa/vore-UI-improvements
Vore fixes and optimizations
|
2019-10-17 12:48:01 -07:00 |
|
Poojawa
|
66c8c17bbd
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-17 05:45:06 -05:00 |
|
Ghommie
|
475303bd02
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-17 00:50:30 +02:00 |
|
Linzolle
|
1690596047
|
you asked for this kevin
|
2019-10-16 15:53:11 -05:00 |
|