 kevinz000
|
df24243113
|
pentawew
|
2017-08-29 10:04:39 -07:00 |
|
|
kevinz000
|
f45f5bbf3d
|
quadruple wew
|
2017-08-29 10:02:18 -07:00 |
|
|
kevinz000
|
5f5065eb46
|
kek
|
2017-08-29 09:59:57 -07:00 |
|
|
kevinz000
|
ca5462adce
|
triple wew
|
2017-08-29 09:55:02 -07:00 |
|
|
kevinz000
|
5591afc9ce
|
double wew
|
2017-08-29 09:53:11 -07:00 |
|
|
kevinz000
|
e4ae2c8021
|
wew
|
2017-08-29 09:44:30 -07:00 |
|
|
kevinz000
|
911e1fa194
|
sync
|
2017-08-29 09:43:10 -07: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
|
b753909958
|
Cult ghosts can no longer be potentially deconverted or debrained
|
2017-08-29 10:25:31 -05:00 |
|
|
CitadelStationBot
|
3fe08c3cc7
|
Prevents medbeams from crossing themselves
|
2017-08-29 09:50:47 -05:00 |
|
|
CitadelStationBot
|
0091a81009
|
Changes sql version to check for schema being ahead
|
2017-08-29 09:50:33 -05:00 |
|
|
CitadelStationBot
|
54c68decde
|
Fixes clowns blowing shit up not being logged 50% of the time
|
2017-08-29 09:32:06 -05:00 |
|
|
kevinz000
|
62a358574c
|
sync
|
2017-08-29 02:37:34 -07: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
|
b39bd24aaa
|
Merge branch 'master' into upstream-merge-30218
|
2017-08-28 09:03:46 -05:00 |
|
|
LetterJay
|
472e39693f
|
Update allinone.dm
|
2017-08-28 09:02:35 -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 |
|
|
CitadelStationBot
|
2a0f617f68
|
Adds more round id tracking
|
2017-08-28 05:50:05 -05:00 |
|