deathride58
|
72bc951aa2
|
Merge pull request #4103 from Citadel-Station-13/upstream-merge-33004
[MIRROR] If a client mob ends up in nullspace with no admins on a message is sent to chat
|
2017-11-24 23:11:58 +00:00 |
|
deathride58
|
d5756e11d6
|
Merge pull request #4107 from Citadel-Station-13/upstream-merge-33009
[MIRROR] Rename LICENSE-GPLv3.txt to OLD_LICENSE-GPLv3.txt
|
2017-11-24 23:03:17 +00:00 |
|
CitadelStationBot
|
54947e9f8a
|
Automatic changelog generation for PR #4099 [ci skip]
|
2017-11-24 17:01:38 -06:00 |
|
deathride58
|
5ee634aa31
|
Merge pull request #4099 from Citadel-Station-13/upstream-merge-32626
[MIRROR] Custom docker improvements
|
2017-11-24 23:01:35 +00:00 |
|
CitadelStationBot
|
ac3e4a800b
|
Automatic changelog generation for PR #4100 [ci skip]
|
2017-11-24 17:00:07 -06:00 |
|
deathride58
|
a591fb6019
|
Merge pull request #4100 from Citadel-Station-13/upstream-merge-32995
[MIRROR] Remove NODROP from water tank misters
|
2017-11-24 23:00:04 +00:00 |
|
CitadelStationBot
|
7a2ef152f9
|
Automatic changelog generation for PR #4112 [ci skip]
|
2017-11-24 16:57:28 -06:00 |
|
deathride58
|
2b0bb76b9e
|
Merge pull request #4112 from Citadel-Station-13/upstream-merge-32985
[MIRROR] Fixes AIs being unable to interact with unscrewed airlocks
|
2017-11-24 22:57:26 +00:00 |
|
deathride58
|
53ad0a0d6d
|
Merge pull request #4115 from Citadel-Station-13/upstream-merge-33040
[MIRROR] comma splice and ellipsis grammar fix
|
2017-11-24 22:57:05 +00:00 |
|
CitadelStationBot
|
aaa221a8cb
|
Automatic changelog generation for PR #4106 [ci skip]
|
2017-11-24 16:56:52 -06:00 |
|
deathride58
|
8cc3d086f5
|
Merge pull request #4106 from Citadel-Station-13/upstream-merge-33016
[MIRROR] Fix misplaced corners in the Hotel brig
|
2017-11-24 22:56:49 +00:00 |
|
CitadelStationBot
|
4b3958b50c
|
comma splice and ellipsis grammar fix
|
2017-11-24 15:21:11 -06:00 |
|
Armhulen
|
a12a12b550
|
comma splice and ellipsis grammar fix (#33040)
* :*)
* i think this fixes splice
|
2017-11-24 15:21:11 -06:00 |
|
CitadelStationBot
|
f0b8b459a7
|
Fixes AIs being unable to interact with unscrewed airlocks
|
2017-11-24 14:11:39 -06:00 |
|
Leo
|
541b8db684
|
Merge pull request #32985 from YPOQ/airlockfix
Fixes AIs being unable to interact with unscrewed airlocks
|
2017-11-24 14:11:39 -06:00 |
|
CitadelStationBot
|
14c281ce59
|
Rename LICENSE-GPLv3.txt to OLD_LICENSE-GPLv3.txt
|
2017-11-24 13:00:26 -06:00 |
|
Jordan Brown
|
850b709afb
|
Rename LICENSE-GPLv3.txt to OLD_LICENSE-GPLv3.txt (#33009)
* Rename LICENSE-GPLv3.txt to OLD_LICENSE-GPLv3.txt
* Update license file name in README.md
|
2017-11-24 13:00:26 -06:00 |
|
CitadelStationBot
|
58c9e7f58c
|
Fix misplaced corners in the Hotel brig
|
2017-11-24 13:00:18 -06:00 |
|
Tad Hardesty
|
7ea123449b
|
Fix misplaced corners in the Hotel (#33016)
|
2017-11-24 13:00:18 -06:00 |
|
CitadelStationBot
|
5249be0546
|
If a client mob ends up in nullspace with no admins on a message is sent to chat
|
2017-11-24 12:59:54 -06:00 |
|
Jordan Brown
|
fe1d69c35d
|
IRC message if client mob ends up in nullspace (#33004)
Only if no admins are online
|
2017-11-24 12:59:54 -06:00 |
|
CitadelStationBot
|
2bca6903d7
|
Remove NODROP from water tank misters
|
2017-11-24 12:59:25 -06:00 |
|
Tad Hardesty
|
9806de310d
|
Remove NODROP from water tank misters (#32995)
|
2017-11-24 12:59:25 -06:00 |
|
CitadelStationBot
|
3a556450ae
|
Custom docker improvements
|
2017-11-24 12:59:17 -06:00 |
|
Emmett Gaines
|
0b07f80b62
|
custom docker improvements (#32626)
|
2017-11-24 12:59:17 -06:00 |
|
CitadelStationBot
|
9f7b3a11c3
|
Automatic changelog generation for PR #4095 [ci skip]
|
2017-11-24 00:42:54 -06:00 |
|
deathride58
|
470f4169df
|
Merge pull request #4095 from Citadel-Station-13/upstream-merge-33018
[MIRROR] Replaces "console screen" stock part with glass sheets
|
2017-11-24 06:42:51 +00:00 |
|
deathride58
|
d5d89a57b4
|
Update stock_parts.dm
|
2017-11-23 23:50:25 -05:00 |
|
CitadelStationBot
|
876b3ebff0
|
Automatic changelog generation for PR #4084 [ci skip]
|
2017-11-23 22:41:57 -06:00 |
|
LetterJay
|
aade2d210a
|
Merge pull request #4084 from deathride58/mapfixes11222017
Fixes a couple of issues introduced in boxstation after recent sync, readds boxstation's secure cell in security
|
2017-11-23 22:41:54 -06:00 |
|
deathride58
|
e60399e402
|
Merge pull request #4090 from Citadel-Station-13/upstream-merge-32997
[MIRROR] Fixes strings runtime
|
2017-11-24 02:30:47 +00:00 |
|
ACCount
|
2147c60b7f
|
Replaces "console screen" stock part with glass sheets
|
2017-11-23 18:53:47 -06:00 |
|
deathride58
|
9a46efd304
|
Merge pull request #4094 from Citadel-Station-13/kevinz000-patch-1
characters must now be 18+
|
2017-11-24 00:47:12 +00:00 |
|
kevinz000
|
399c2ebfcc
|
Update _compile_options.dm
|
2017-11-23 16:37:49 -08:00 |
|
deathride58
|
751b61a9ab
|
Merge pull request #4065 from Poojawa/layering-memes
Edited breast sprites
|
2017-11-24 00:20:29 +00:00 |
|
deathride58
|
de27afbc61
|
Merge pull request #4093 from Citadel-Station-13/upstream-merge-33045
[MIRROR] Fixes component runtimes
|
2017-11-24 00:19:42 +00:00 |
|
deathride58
|
f83ce9cd11
|
Merge pull request #4073 from Citadel-Station-13/upstream-merge-32937
[MIRROR] Simple wall turret buff
|
2017-11-24 00:19:24 +00:00 |
|
deathride58
|
de9cfb2b7c
|
Update brain_damage_lines.json
|
2017-11-23 19:14:21 -05:00 |
|
deathride58
|
6d6afcd588
|
Merge pull request #4091 from Citadel-Station-13/upstream-merge-33041
[MIRROR] Lowers the stress the dna console puts on the string tree
|
2017-11-24 00:11:16 +00:00 |
|
deathride58
|
eb722bf59f
|
Merge branch 'master' into upstream-merge-33045
|
2017-11-24 00:10:36 +00:00 |
|
deathride58
|
efe10a1ee7
|
Merge pull request #4089 from Citadel-Station-13/upstream-merge-32979
[MIRROR] Adds some sanity checks to component creation
|
2017-11-24 00:08:36 +00:00 |
|
deathride58
|
d912152d65
|
Merge pull request #4085 from Citadel-Station-13/upstream-merge-33010
[MIRROR] Fixes deleted turfs
|
2017-11-24 00:08:12 +00:00 |
|
Jordan Brown
|
b2bb942817
|
Fixes component runtimes
|
2017-11-23 13:12:38 -06:00 |
|
CitadelStationBot
|
aaa83112e8
|
Lowers the stress the dna console puts on the string tree
|
2017-11-23 12:07:17 -06:00 |
|
Jordan Brown
|
8943bf0184
|
Merge pull request #33041 from MrStonedOne/patch-452
Lowers the stress the dna console puts on the string tree
|
2017-11-23 12:07:17 -06:00 |
|
Leo
|
67d495c053
|
Fixes strings runtime
|
2017-11-23 05:48:44 -06:00 |
|
CitadelStationBot
|
89b9ec51de
|
Adds some sanity checks to component creation
|
2017-11-23 05:47:32 -06:00 |
|
Leo
|
598f0dc580
|
Merge pull request #32979 from tgstation/Cyberboss-patch-4
Adds some sanity checks to component creation
|
2017-11-23 05:47:32 -06:00 |
|
deathride58
|
0ca050563f
|
fixes merge conflicts
|
2017-11-22 23:43:03 -05:00 |
|
ShizCalev
|
1b094a4374
|
Fixes deleted turfs
|
2017-11-22 22:01:05 -06:00 |
|