 kevinz000
|
7549fb09fa
|
Merge pull request #2416
|
2017-08-29 22:27:19 -07:00 |
|
|
kevinz000
|
4b32cf2e0f
|
Merge pull request #2415
|
2017-08-29 22:27:15 -07:00 |
|
|
kevinz000
|
25e1a78b51
|
Merge pull request #2407
|
2017-08-29 22:27:13 -07:00 |
|
|
kevinz000
|
5c7b743cfa
|
Merge pull request #2405
|
2017-08-29 22:27:10 -07:00 |
|
|
kevinz000
|
5dc670e282
|
Merge pull request #2401
|
2017-08-29 22:27:07 -07:00 |
|
|
kevinz000
|
8ce807deb6
|
Merge pull request #2280
|
2017-08-29 22:27:01 -07:00 |
|
|
kevinz000
|
fcddd32703
|
Merge pull request #2195
|
2017-08-29 22:26:58 -07:00 |
|
|
kevinz000
|
9b71e967d2
|
Merge branch 'master' into upstream-merge-29964
|
2017-08-29 21:07:01 -07:00 |
|
|
kevinz000
|
41c1f939ab
|
gdi
|
2017-08-29 20:21:41 -07:00 |
|
|
kevinz000
|
92a2ac0ae3
|
soft sync
|
2017-08-29 20:20:11 -07:00 |
|
|
kevinz000
|
17f3ce92b6
|
Merge branch 'master' into upstream-merge-29960
|
2017-08-29 20:14:22 -07:00 |
|
|
kevinz000
|
bf5d1fc159
|
sync
|
2017-08-29 20:14:08 -07:00 |
|
|
LetterJay
|
0970653382
|
adds missing var preventing guilmon bodymarkings from being displayed
|
2017-08-29 21:26:50 -05:00 |
|
|
LetterJay
|
b2114a7b81
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-08-29 21:19:22 -05:00 |
|
|
kevinz000
|
301a581e64
|
sync
|
2017-08-29 09:41:11 -07:00 |
|
|
kevinz000
|
064ade469f
|
sync
|
2017-08-29 09:35:55 -07:00 |
|
|
kevinz000
|
3c87a1f971
|
Merge branch 'master' into upstream-merge-29718
|
2017-08-29 09:34:07 -07:00 |
|
|
kevinz000
|
88093698f2
|
sync
|
2017-08-29 09:33:37 -07:00 |
|
|
kevinz000
|
80221fa874
|
sync
|
2017-08-29 09:32:40 -07:00 |
|
|
kevinz000
|
61b8c48872
|
sync
|
2017-08-29 09:29:45 -07:00 |
|
|
kevinz000
|
498bd61928
|
sync
|
2017-08-29 09:12:56 -07:00 |
|
|
CitadelStationBot
|
3fe08c3cc7
|
Prevents medbeams from crossing themselves
|
2017-08-29 09:50:47 -05:00 |
|
|
CitadelStationBot
|
2ff65a8e39
|
[MIRROR] Lowers the chance for monkeys to become gorillas (#2476)
* Lowers the chance for monkeys to become gorillas
* Delete life.dm.rej
* Update life.dm
|
2017-08-29 00:59:34 -07:00 |
|
|
LetterJay
|
798c14cc2b
|
Merge pull request #2532 from Citadel-Station-13/upstream-merge-30238
[MIRROR] Fixes ingredients-box sprite.
|
2017-08-29 02:14:30 -05:00 |
|
|
LetterJay
|
97bee315bf
|
Update living_defense.dm
|
2017-08-29 01:50:46 -05:00 |
|
|
LetterJay
|
4bfade5704
|
Merge branch 'master' into upstream-merge-29718
|
2017-08-29 01:48:22 -05:00 |
|
|
LetterJay
|
292f5d5d35
|
Update boxes.dm
|
2017-08-29 01:46:21 -05:00 |
|
|
CitadelStationBot
|
d55bac862e
|
Updates out of date documentation
|
2017-08-28 14:52:27 -05:00 |
|
|
CitadelStationBot
|
f191f5c827
|
Fixes ingredients-box sprite.
|
2017-08-28 14:39:03 -05:00 |
|
|
LetterJay
|
6c76ae2395
|
clean up
|
2017-08-28 10:34:31 -05:00 |
|
|
LetterJay
|
7ea6eeb64e
|
GUHRILLAZ
|
2017-08-28 10:23:11 -05:00 |
|
|
LetterJay
|
defab9c7fc
|
Merge branch 'master' into upstream-merge-29923
|
2017-08-28 09:19:44 -05:00 |
|
|
LetterJay
|
739d5c70a7
|
Update meat.dm
|
2017-08-28 09:17:14 -05:00 |
|
|
LetterJay
|
27750d91d6
|
Merge pull request #2529 from Citadel-Station-13/upstream-merge-30214
[MIRROR] Removes the suppose-to-be unused shuttle wall path
|
2017-08-28 09:01:47 -05:00 |
|
|
LetterJay
|
792c509827
|
Merge pull request #2526 from Citadel-Station-13/upstream-merge-30200
[MIRROR] Fixes survival_pods being a valid_territory for gangs sprays & dominations/blob takeovers/cult summons/ect
|
2017-08-28 09:01:06 -05:00 |
|
|
LetterJay
|
b3c70bf024
|
Merge pull request #2525 from Citadel-Station-13/upstream-merge-30204
[MIRROR] Fixes APC pixel shift being off
|
2017-08-28 09:00:46 -05:00 |
|
|
LetterJay
|
47aa97b847
|
Merge pull request #2523 from Citadel-Station-13/upstream-merge-30207
[MIRROR] Adds separate log for sql errors with no config check
|
2017-08-28 09:00:19 -05:00 |
|
|
LetterJay
|
db56781717
|
Merge pull request #2522 from Citadel-Station-13/upstream-merge-30222
[MIRROR] Fixes surplus log icons.
|
2017-08-28 08:58:06 -05:00 |
|
|
LetterJay
|
e34367c41b
|
Merge pull request #2521 from Citadel-Station-13/upstream-merge-30225
[MIRROR] Switched dirtystation to use typecaches for checks
|
2017-08-28 08:57:52 -05:00 |
|
|
LetterJay
|
3a8cf01e65
|
Merge pull request #2520 from Citadel-Station-13/upstream-merge-30231
[MIRROR] Adds logging cause of microbomb activation in admin logs
|
2017-08-28 08:57:36 -05:00 |
|
|
LetterJay
|
4b1887ce12
|
Merge pull request #2519 from Citadel-Station-13/upstream-merge-30228
[MIRROR] file2list passes the file thru trim()
|
2017-08-28 08:57:19 -05:00 |
|
|
LetterJay
|
03a26e6468
|
Merge pull request #2518 from Citadel-Station-13/kevinz000-patch-5
absolute pathing for mammals
|
2017-08-28 08:56:55 -05:00 |
|
|
LetterJay
|
02ba44a8eb
|
Merge pull request #2505 from Citadel-Station-13/upstream-merge-30169
[MIRROR] Allows disabling shuttle purchases per map.
|
2017-08-28 08:56:33 -05:00 |
|
|
LetterJay
|
a17ed054d6
|
Merge pull request #2503 from Citadel-Station-13/upstream-merge-30172
[MIRROR] Maintains that weird entire-tcomms-setup-in-one-machine thing
|
2017-08-28 08:56:11 -05:00 |
|
|
LetterJay
|
29de038837
|
Merge pull request #2498 from Citadel-Station-13/upstream-merge-30162
[MIRROR] Gives plasmamen hallucinations when taking blackpowder
|
2017-08-28 08:54:01 -05:00 |
|
|
LetterJay
|
2fe2912fa3
|
Merge pull request #2496 from Citadel-Station-13/upstream-merge-30173
[MIRROR] Traitor, a traitor is a traitor.
|
2017-08-28 08:46:53 -05:00 |
|
|
LetterJay
|
c043b8a1d5
|
Merge pull request #2495 from Citadel-Station-13/upstream-merge-30182
[MIRROR] Holoparasite prompts now have a "Never For This Round" option
|
2017-08-28 08:46:19 -05:00 |
|
|
LetterJay
|
7474aa3edb
|
Merge pull request #2492 from Citadel-Station-13/upstream-merge-30191
[MIRROR] Fixes empty adminhelp tickets messages
|
2017-08-28 08:45:49 -05:00 |
|
|
LetterJay
|
5225aa7d65
|
Merge pull request #2493 from Citadel-Station-13/upstream-merge-30192
[MIRROR] Adds volume control to admin-played sounds
|
2017-08-28 08:45:34 -05:00 |
|
|
LetterJay
|
1457e388c2
|
Merge pull request #2494 from Citadel-Station-13/upstream-merge-30183
[MIRROR] Small devil fixes.
|
2017-08-28 08:45:16 -05:00 |
|