kevinz000
|
bdf4f11ab8
|
Update ert.dm
|
2019-07-15 16:56:51 -07:00 |
|
kevinz000
|
f16328c6e7
|
Update ert.dm
|
2019-07-15 16:55:40 -07:00 |
|
CitadelStationBot
|
8c1b7c4f22
|
Automatic changelog generation for PR #8693 [ci skip]
|
2019-07-14 16:52:31 -05:00 |
|
kevinz000
|
61bc43a0d7
|
Merge pull request #8693 from Ghommie/Ghommie-cit70
Ports "clothes burning only spam You of Your clothes"
|
2019-07-14 14:52:29 -07:00 |
|
kevinz000
|
628244c0ba
|
Merge pull request #8869 from Ghommie/Ghommie-cit129
Ports "Show codewords on round end screen"
|
2019-07-14 14:49:11 -07:00 |
|
CitadelStationBot
|
f19b3d9ae2
|
Automatic changelog generation for PR #8877 [ci skip]
|
2019-07-14 16:48:51 -05:00 |
|
kevinz000
|
c06d495731
|
Merge pull request #8877 from BurgerLUA/REMOVE-C8A5DC
REMOVE #C8A5DC. COLOR STRONG.
|
2019-07-14 14:48:49 -07:00 |
|
CitadelStationBot
|
c1fbd2d04b
|
Automatic changelog generation for PR #8725 [ci skip]
|
2019-07-14 16:48:29 -05:00 |
|
kevinz000
|
1564f38ff8
|
Merge pull request #8725 from Trilbyspaceclone/meme_tools
Adds more bronze tools
|
2019-07-14 14:48:27 -07:00 |
|
CitadelStationBot
|
8a1e31e123
|
Automatic changelog generation for PR #8676 [ci skip]
|
2019-07-14 16:46:46 -05:00 |
|
kevinz000
|
2c41141d2f
|
Merge pull request #8676 from Trilbyspaceclone/patch-176
Adds a Rapier for 8 Trilby cats
|
2019-07-14 14:46:44 -07:00 |
|
CitadelStationBot
|
a11d92b242
|
Automatic changelog generation for PR #8796 [ci skip]
|
2019-07-14 16:44:03 -05:00 |
|
kevinz000
|
0c658ba41a
|
Merge pull request #8796 from Trilbyspaceclone/patch-190
Russian Paratrooper Jumper Uniform fix
|
2019-07-14 14:44:01 -07:00 |
|
CitadelStationBot
|
122dda798d
|
Automatic changelog generation for PR #8880 [ci skip]
|
2019-07-14 16:20:55 -05:00 |
|
kevinz000
|
9de885da32
|
Merge pull request #8880 from CameronWoof/air-alarms-should-be-green
Makes Air Alarms Green
|
2019-07-14 14:20:54 -07:00 |
|
CitadelStationBot
|
c52ceb7ecf
|
Automatic changelog generation for PR #8724 [ci skip]
|
2019-07-14 16:20:06 -05:00 |
|
kevinz000
|
705b12fc50
|
Merge pull request #8724 from Trilbyspaceclone/Rnd_brakeup
Brakes up Blue space Rnd tech nodes
|
2019-07-14 14:20:03 -07:00 |
|
CitadelStationBot
|
f13d16e4a1
|
Automatic changelog generation for PR #7544 [ci skip]
|
2019-07-14 16:15:55 -05:00 |
|
kevinz000
|
102bede4be
|
Merge pull request #7544 from deathride58/nanitepoolnerf
Nerfs nanite pools
|
2019-07-14 14:15:53 -07:00 |
|
CitadelStationBot
|
b138b2420a
|
Automatic changelog generation for PR #8785 [ci skip]
|
2019-07-14 16:11:12 -05:00 |
|
kevinz000
|
da8b43f054
|
Merge pull request #8785 from Trilbyspaceclone/Just_Smile!
Makes Clowns and HonkMother Chaplins smile!
|
2019-07-14 14:11:09 -07:00 |
|
kevinz000
|
2ec5d3f02e
|
Merge pull request #8886 from Ghommie/Ghommie-cit137
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-14 14:05:20 -07:00 |
|
CitadelStationBot
|
5be6b358f0
|
Automatic changelog generation for PR #8887 [ci skip]
|
2019-07-14 16:04:22 -05:00 |
|
kevinz000
|
a573689101
|
Merge pull request #8887 from Poojawa/last-word-hearing-psychics
Gang victory news report and last words for discord bot
|
2019-07-14 14:04:20 -07:00 |
|
Ghommie
|
a3a2fb03b6
|
My bad, my bad.
|
2019-07-14 14:21:28 +02:00 |
|
CitadelStationBot
|
090decbbc1
|
Automatic changelog generation for PR #8857 [ci skip]
|
2019-07-14 05:38:47 -05:00 |
|
kevinz000
|
b153294a24
|
Merge pull request #8857 from Ghommie/Ghoomie-cit127
Refactoring underwear to allow custom color preferences.
|
2019-07-14 03:38:45 -07:00 |
|
CitadelStationBot
|
2c4b47e038
|
Automatic changelog generation for PR #8873 [ci skip]
|
2019-07-14 05:38:06 -05:00 |
|
kevinz000
|
44474ddbd0
|
Merge pull request #8873 from Ghommie/Ghommie-cit131
Ports "Fixes clockwork armor armor"
|
2019-07-14 03:38:04 -07:00 |
|
CitadelStationBot
|
f67162d27a
|
Automatic changelog generation for PR #8884 [ci skip]
|
2019-07-14 05:37:39 -05:00 |
|
kevinz000
|
d5f156925d
|
Merge pull request #8884 from Ghommie/Ghommie-cit135
Ports "About that beer I owed ya. Adds blueshirt items to sectech and defines them better."
|
2019-07-14 03:37:36 -07:00 |
|
CitadelStationBot
|
3fb213425c
|
Automatic changelog generation for PR #8845 [ci skip]
|
2019-07-14 05:35:35 -05:00 |
|
kevinz000
|
735fc5fab6
|
Merge pull request #8845 from Ghommie/Ghommie-cit121
Tweaking the 🅱️ emoji icon.
|
2019-07-14 03:35:33 -07:00 |
|
CitadelStationBot
|
dbad6f49b5
|
Automatic changelog generation for PR #8883 [ci skip]
|
2019-07-14 05:34:39 -05:00 |
|
kevinz000
|
44e9721d37
|
Merge pull request #8883 from CameronWoof/codifying-mrp
Hexacrocin overdose no longer forces climax
|
2019-07-14 03:34:37 -07:00 |
|
kevinz000
|
e7eda42260
|
Merge pull request #8876 from Poojawa/patch-1
So I was trying to talk to someone with brain damage today
|
2019-07-14 03:34:05 -07:00 |
|
CitadelStationBot
|
a045059c30
|
Automatic changelog generation for PR #8874 [ci skip]
|
2019-07-14 05:33:40 -05:00 |
|
kevinz000
|
2259ea2e1c
|
Merge pull request #8874 from Ghommie/Ghommie-cit132
Ports the Chem Master choose your pill PR plus post-improvements
|
2019-07-14 03:33:37 -07:00 |
|
CitadelStationBot
|
22d1c383f6
|
Automatic changelog generation for PR #8885 [ci skip]
|
2019-07-14 05:33:13 -05:00 |
|
kevinz000
|
5048db3668
|
Merge pull request #8885 from Ghommie/Ghommie-cit136
Ports "Renames SSsqueak to SSminor_mapping"
|
2019-07-14 03:33:11 -07:00 |
|
CitadelStationBot
|
5a9fbf8487
|
Automatic changelog generation for PR #8752 [ci skip]
|
2019-07-13 19:15:30 -05:00 |
|
deathride58
|
a27222fba7
|
Merge pull request #8752 from Sishen1542/uhhhhh
Slimepeople can now morph the shape and size of their genitalia.
|
2019-07-13 20:15:28 -04:00 |
|
Poojawa
|
245bd3e650
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into last-word-hearing-psychics
|
2019-07-13 10:18:13 -05:00 |
|
Poojawa
|
4d895ae6c0
|
Gang victory news report and last words for discord bot
also slight improvement to gangster greetings
|
2019-07-13 08:38:19 -05:00 |
|
Ghommie
|
129ca9d71f
|
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-13 10:27:39 +02:00 |
|
CameronWoof
|
68c6aa4fa9
|
ghommie's suggestions
|
2019-07-12 22:34:25 -07:00 |
|
Ghommie
|
71720f8a32
|
missed bits.
|
2019-07-13 07:12:37 +02:00 |
|
Ghommie
|
8f410429de
|
Ports "Renames SSsqueak to SSminor_mapping"
|
2019-07-13 07:08:03 +02:00 |
|
Ghommie
|
31bd9104bb
|
Ports "Adds blueshirt items to sectech and defines them better."
|
2019-07-13 06:42:09 +02:00 |
|
CameronWoof
|
067ec1ac92
|
Removes forced climax from hexacrocin overdose
|
2019-07-12 18:33:13 -07:00 |
|