Commit Graph

3555 Commits

Author SHA1 Message Date
CitadelStationBot
292bed59f0 Adds a crew monitoring console to the warden's office in BoxStation 2017-07-09 19:43:35 -05:00
LetterJay
6e646c44cf Merge pull request #1957 from Citadel-Station-13/upstream-merge-29125
[MIRROR] Fixes wrapping objects
2017-07-09 15:51:49 -05:00
CitadelStationBot
b770348797 Fixes wrapping objects 2017-07-09 10:14:16 -05:00
CitadelStationBot
0d84901914 Automatic changelog generation for PR #1943 [ci skip] 2017-07-08 23:50:52 -05:00
CitadelStationBot
4133d62161 [MIRROR] New portable generator icons (#1943)
* New portable generator icons

* Delete port_gen.dm.rej

* Update port_gen.dm
2017-07-08 21:50:51 -07:00
CitadelStationBot
dfe371630b Automatic changelog generation for PR #1948 [ci skip] 2017-07-08 14:33:42 -05:00
LetterJay
c5c66777ab Merge pull request #1948 from Citadel-Station-13/upstream-merge-29114
[MIRROR] Fixes plasma glass merging with normal glass
2017-07-08 14:33:41 -05:00
CitadelStationBot
0ec07c9fda Automatic changelog generation for PR #1945 [ci skip] 2017-07-08 14:33:21 -05:00
LetterJay
73adaf35a9 Merge pull request #1945 from Citadel-Station-13/upstream-merge-29112
[MIRROR] Reinforced Plasma Glass is more SME-worthy
2017-07-08 14:33:20 -05:00
CitadelStationBot
aa790403a5 Automatic changelog generation for PR #1947 [ci skip] 2017-07-08 14:33:08 -05:00
LetterJay
73016577ca Merge pull request #1947 from Citadel-Station-13/upstream-merge-29111
[MIRROR] Box Viro Wants Plasma v2
2017-07-08 14:33:05 -05:00
CitadelStationBot
c87c6f7053 Automatic changelog generation for PR #1950 [ci skip] 2017-07-08 14:32:52 -05:00
LetterJay
bef2941681 Merge pull request #1950 from Citadel-Station-13/upstream-merge-29123
[MIRROR] Refactors catching to use attack_hand
2017-07-08 14:32:51 -05:00
LetterJay
26fbf67846 Merge pull request #1951 from Citadel-Station-13/upstream-merge-29120
[MIRROR] Fixes repeated adminhelp message
2017-07-08 14:32:39 -05:00
CitadelStationBot
d608741385 Fixes repeated adminhelp message 2017-07-08 13:19:07 -05:00
CitadelStationBot
2d4604c94b Refactors catching to use attack_hand 2017-07-08 13:19:02 -05:00
CitadelStationBot
2d84e09851 Fixes plasma glass merging with normal glass 2017-07-08 09:45:46 -05:00
CitadelStationBot
acb20fcde2 Box Viro Wants Plasma v2 2017-07-08 09:45:42 -05:00
CitadelStationBot
7dd32c4ad9 Reinforced Plasma Glass is more SME-worthy 2017-07-08 09:44:34 -05:00
CitadelStationBot
2e4624ee3f Make timer debug info more robust (#1942) 2017-07-07 23:49:10 -07:00
CitadelStationBot
ae544bff64 Automatic changelog generation for PR #1940 [ci skip] 2017-07-08 01:48:50 -05:00
CitadelStationBot
9874978c5c Dreams while sleeping are now slightly longer on average and will contain more possibilities (#1940) 2017-07-07 23:48:49 -07:00
CitadelStationBot
a85476ec78 Corrected misplaced vents on Delta (#1939) 2017-07-07 23:48:37 -07:00
TalkingCactus
44206f3bf7 Update suicide.dm
just close the game
2017-07-07 18:50:13 -04:00
TalkingCactus
cb5247d060 Fixes Gamemode Voting & Map Edits (#1937)
* fixes roundtype voting

* keg spawner

* maint bar to box and kinkmates to delta+meta
2017-07-07 17:54:53 -04:00
LetterJay
ff15495f18 Merge pull request #1936 from Citadel-Station-13/upstream-merge-29093
[MIRROR] Request only the round ID in the issue template
2017-07-07 15:18:02 -05:00
CitadelStationBot
f44b3cd279 Automatic changelog generation for PR #1935 [ci skip] 2017-07-07 15:17:47 -05:00
LetterJay
29ef7a9338 Merge pull request #1935 from Citadel-Station-13/upstream-merge-29046
[MIRROR] Adding the mook/wanderer mob for planetstation
2017-07-07 15:17:45 -05:00
CitadelStationBot
c9cbd10ab1 Automatic changelog generation for PR #1934 [ci skip] 2017-07-07 15:16:48 -05:00
LetterJay
6673656ce6 Merge pull request #1934 from Citadel-Station-13/upstream-merge-28993
[MIRROR] Adds Headphones!
2017-07-07 15:16:47 -05:00
CitadelStationBot
5f8c523cc2 Request only the round ID in the issue template 2017-07-07 15:03:17 -05:00
CitadelStationBot
7b52f001ed Adding the mook/wanderer mob for planetstation 2017-07-07 14:16:26 -05:00
Poojawa
338ba1d71e Vore sound licensing 2017-07-07 13:08:42 -05:00
CitadelStationBot
b42fb13549 Adds Headphones! 2017-07-07 12:44:47 -05:00
CitadelStationBot
b0cf4a2e37 Removed silicon SM interact message (#1929) 2017-07-07 10:35:55 -07:00
CitadelStationBot
998a75bc89 Makes martial arts not be deleted (#1931) 2017-07-07 10:35:40 -07:00
CitadelStationBot
29d2c7b980 Fixes permissions elevation exploit (#1930) 2017-07-07 10:35:17 -07:00
CitadelStationBot
aac9c515ed Automatic changelog generation for PR #1932 [ci skip] 2017-07-07 12:34:59 -05:00
CitadelStationBot
9a4698874f Adds alarm sounds to SM (#1932) 2017-07-07 10:34:58 -07:00
CitadelStationBot
8525b2129e Windows now have the proper starting health (#1927) 2017-07-07 10:34:42 -07:00
CitadelStationBot
bdd9978dcf De-lags sandbox a bit (#1928) 2017-07-07 10:34:25 -07:00
CitadelStationBot
5dd25bda95 Minor Projectile Reflection Refactor (#1926) 2017-07-07 10:33:59 -07:00
CitadelStationBot
be5ad79fa2 Changes SM integrity rounding (#1925) 2017-07-07 10:33:45 -07:00
CitadelStationBot
be15914a6f Minor code clean up in magnet controller (#1921) 2017-07-07 04:47:52 -07:00
CitadelStationBot
6145b939fa Fix incorrect call to do_attack_animation (#1920) 2017-07-07 04:47:28 -07:00
CitadelStationBot
bf14c1dd61 Machine subsystem now checks qdel status (#1922) 2017-07-07 04:46:36 -07:00
CitadelStationBot
efae0e576e Allows [s] to be used anywhere in the title (#1923) 2017-07-07 04:46:26 -07:00
LetterJay
ef4befcdd5 Merge pull request #1919 from Citadel-Station-13/upstream-merge-29071
[MIRROR] Fixes world.internet_address in irc check
2017-07-06 22:48:06 -05:00
LetterJay
8bfda97c09 Merge pull request #1918 from Citadel-Station-13/upstream-merge-28998
[MIRROR] Actually fixes wormhole jaunters, and no it was not my fault.
2017-07-06 22:47:51 -05:00
LetterJay
b87632669e Merge pull request #1917 from Citadel-Station-13/upstream-merge-29061
[MIRROR] Warp cubes are slightly less instant but way cooler
2017-07-06 22:47:38 -05:00