kevinz000
d15b0b9606
stuff
2017-05-14 14:00:51 -07:00
kevinz000
25024432fe
more procs and roundstart loading files
2017-05-13 16:23:43 -07:00
kevinz000
9e0866871e
lists and stuff
2017-05-13 11:26:07 -07:00
kevinz000
e9a35b03f6
dme
2017-05-10 16:22:19 -07:00
kevinz000
29a3968f48
kinda_working
2017-05-10 03:41:01 -07:00
LetterJay
9687080cd0
Crab/Carp DEVOURALE = TRUE
2017-05-09 21:04:08 -05:00
kevinz000
005d8a8156
Lets try that again... ( #868 )
...
* TGUI GPS
* fixes .rej
2017-05-08 22:58:46 -07:00
kevinz000
77c066d93a
Revert "[MIRROR] TGUI GPS" ( #867 )
...
* Revert "Automatic changelog generation for PR #608 [ci skip]"
This reverts commit 7701c39fde#608 )"
This reverts commit ba0f4b1c59
2017-05-08 22:48:34 -07:00
CitadelStationBot
7701c39fde
Automatic changelog generation for PR #608 [ci skip]
2017-05-09 00:46:43 -05:00
CitadelStationBot
ba0f4b1c59
TGUI GPS ( #608 )
2017-05-08 22:46:42 -07:00
kevinz000
0c5d7796f8
Update useless.txt
2017-05-08 22:39:50 -07:00
CitadelStationBot
46d1f5575a
Automatic changelog generation for PR #785 [ci skip]
2017-05-09 00:16:11 -05:00
CitadelStationBot
faf8829d30
[MIRROR] Adamantine golem leadership ( #785 )
...
* Adamantine golem leadership
* Update stylesheet.dm
* Delete golems.dm.rej
* Delete stylesheet.dm.rej
* Update golems.dm
* fuck line endings
2017-05-08 22:16:09 -07:00
CitadelStationBot
c7b78203a5
Fixes spelling error when implanting BITTEN organs ( #847 )
2017-05-08 16:48:44 -07:00
CitadelStationBot
5c8a9c5342
Syndicate borg/reinforcement spawners have a Never For This Round option. ( #851 )
2017-05-08 16:48:28 -07:00
CitadelStationBot
9abfbb46d4
Fixes female undershirts showing all the time ( #741 )
2017-05-08 16:47:35 -07:00
CitadelStationBot
c782e15d64
[MIRROR] Fix server hop ( #740 )
...
* Fix server hop
* Delete new_player.dm.rej
2017-05-08 16:47:21 -07:00
CitadelStationBot
4895d84fb9
Automatic changelog generation for PR #758 [ci skip]
2017-05-08 18:46:00 -05:00
CitadelStationBot
8e0e77cd35
Nerfs Chaplain smoke book. ( #758 )
2017-05-08 16:45:59 -07:00
CitadelStationBot
53dba37fca
Fixes decals on shuttles ( #855 )
2017-05-08 16:44:59 -07:00
CitadelStationBot
44c29c6193
Fixes clothing damage message ( #831 )
2017-05-08 16:44:38 -07:00
CitadelStationBot
c506b6c7ce
Makes initial adamantine golem shells non-anchored and non-dense ( #856 )
2017-05-08 16:44:11 -07:00
CitadelStationBot
e94e1efb4f
Automatic changelog generation for PR #862 [ci skip]
2017-05-08 18:43:38 -05:00
CitadelStationBot
92bbdafc94
Adjusts Meteor Shuttle name for grammar ( #862 )
2017-05-08 16:43:37 -07:00
CitadelStationBot
09eb38714d
[MIRROR] Flushes Ling & Alien HUD info with the edge of the screen ( #721 )
...
* Flushes Ling & Alien HUD info with the edge of the screen
* Update _defines.dm
* Delete _defines.dm.rej
* fucking endlines
2017-05-08 00:32:40 -07:00
CitadelStationBot
3ce2f5c698
Automatic changelog generation for PR #844 [ci skip]
2017-05-08 02:31:55 -05:00
CitadelStationBot
65729cdd55
[MIRROR] Fixes being unable to hit trophy cases in melee ( #844 )
...
* Fixes being unable to hit trophy cases in melee
* Update displaycase.dm
* Delete displaycase.dm.rej
* Update displaycase.dm
2017-05-08 00:31:54 -07:00
CitadelStationBot
e54a6725ea
Automatic changelog generation for PR #763 [ci skip]
2017-05-08 02:26:00 -05:00
CitadelStationBot
9acc4da365
[MIRROR] Curator starts with the key to the display cases instead of being the key ( #763 )
...
* Curator starts with the key to the display cases instead of being the key
* Update displaycase.dm
* Delete displaycase.dm.rej
* Delete civilian.dm.rej
* Update civilian.dm
* fuck line endings
* define true/false
2017-05-08 00:25:59 -07:00
CitadelStationBot
e89bdb6422
[MIRROR] Fixes some stuff ( #768 )
...
* Fixes some stuff
* line fucking endings
2017-05-08 00:25:40 -07:00
CitadelStationBot
0eb1b603b2
Automatic changelog generation for PR #806 [ci skip]
2017-05-08 02:25:22 -05:00
CitadelStationBot
a6cb12b84a
[MIRROR] Plastic golems ( #806 )
...
* Plastic golems
* Update lavaland_ruin_code.dm
* Delete lavaland_ruin_code.dm.rej
2017-05-08 00:25:20 -07:00
CitadelStationBot
f59f2ff8ed
Automatic changelog generation for PR #696 [ci skip]
2017-05-08 01:19:36 -05:00
kevinz000
41341e50a5
Merge pull request #696 from Citadel-Station-13/upstream-merge-25458
...
[MIRROR] Belligerent now prevents you from running even between chants
2017-05-07 23:19:35 -07:00
kevinz000
49881624e2
Merge pull request #772 from Citadel-Station-13/upstream-merge-26874
...
[MIRROR] Fixes the most annoying thing about admin helping.
2017-05-07 23:16:33 -07:00
kevinz000
ce7b714ada
Merge pull request #730 from Citadel-Station-13/upstream-merge-26862
...
[MIRROR] If you're gonna rename a job, do it right!
2017-05-07 23:16:21 -07:00
kevinz000
010baa6a34
Merge pull request #661 from Citadel-Station-13/upstream-merge-26705
...
[MIRROR] Fixes spelling for Lavaland Syndicate
2017-05-07 22:53:29 -07:00
CitadelStationBot
8edb386906
Automatic changelog generation for PR #735 [ci skip]
2017-05-08 00:53:25 -05:00
kevinz000
a87424e105
Merge pull request #735 from Citadel-Station-13/upstream-merge-26813
...
[MIRROR] Curator Update
2017-05-07 22:53:24 -07:00
kevinz000
9ca8b570b2
Merge branch 'master' into upstream-merge-26705
2017-05-07 22:53:14 -07:00
kevinz000
52a8aacd00
Delete lavaland_ruin_code.dm.rej
2017-05-07 22:52:47 -07:00
kevinz000
204a3a3938
Update lavaland_ruin_code.dm
2017-05-07 22:52:39 -07:00
kevinz000
106a9d3ad9
Delete clockwork_slab.dm.rej
2017-05-07 22:48:04 -07:00
kevinz000
e12fc21d60
Update clockwork_slab.dm
2017-05-07 22:47:58 -07:00
kevinz000
bebb9ec571
Delete status_effect.dm.rej
2017-05-07 22:44:14 -07:00
kevinz000
14a9bda61e
Update status_effect.dm
2017-05-07 22:44:06 -07:00
kevinz000
bd8bfe1327
Merge pull request #684 from Citadel-Station-13/upstream-merge-26728
...
[MIRROR] A bunch of sparks to do_sparks [Travis error unrelated to PR]
2017-05-07 22:41:24 -07:00
CitadelStationBot
e611a7d095
Automatic changelog generation for PR #835 [ci skip]
2017-05-08 00:36:54 -05:00
kevinz000
8c80fee6aa
Merge pull request #835 from Citadel-Station-13/upstream-merge-26993
...
[MIRROR] Allows Mediborg organ storage to hold inorganic bodyparts
2017-05-07 22:36:52 -07:00
CitadelStationBot
451ca85ca4
Automatic changelog generation for PR #803 [ci skip]
2017-05-08 00:36:04 -05:00
