Commit Graph

15643 Commits

Author SHA1 Message Date
LetterJay 705cb7016b manual mirror 2018-04-12 07:21:44 -05:00
LetterJay 3cd0591d90 Merge pull request #6334 from Citadel-Station-13/upstream-merge-36858
[MIRROR] Use a rust DLL for logging
2018-04-12 07:06:08 -05:00
deathride58 d8e3200d6c Merge pull request #6287 from Citadel-Station-13/upstream-merge-36953
[MIRROR] Stack Sheets Cancel Button
2018-04-11 21:40:22 +00:00
deathride58 51147e928f Merge pull request #6307 from Citadel-Station-13/upstream-merge-36974
[MIRROR] Minor VR sleeper related changes
2018-04-11 21:40:00 +00:00
deathride58 2658200472 Merge pull request #6337 from Citadel-Station-13/upstream-merge-37070
[MIRROR] Fixes eminences not being recognized as servants of ratvar
2018-04-11 21:39:39 +00:00
deathride58 aa4a4742e3 Merge pull request #6340 from Citadel-Station-13/upstream-merge-37037
[MIRROR] Adds/changes some tips.
2018-04-11 21:39:01 +00:00
deathride58 512b5e86c9 Merge pull request #6341 from Citadel-Station-13/upstream-merge-36469
[MIRROR] AI requires silicon exp instead of crew exp for roundstart role
2018-04-11 21:38:24 +00:00
deathride58 b4ecb3ef27 Merge pull request #6343 from Citadel-Station-13/upstream-merge-36670
[MIRROR] Whether or not a pacifist can fire a gun is no longer based on the gun being harmful, but the chambered round being harmful
2018-04-11 21:37:24 +00:00
deathride58 f89f9c372e Merge pull request #6344 from Citadel-Station-13/upstream-merge-36693
[MIRROR] Slightly bandaid fix for ntnet json/xorencrypt runtimes
2018-04-11 21:36:35 +00:00
deathride58 538cb55b68 Merge pull request #6346 from Citadel-Station-13/upstream-merge-36791
[MIRROR] Cult spell buttons will no longer hold an empty slot in the regular action bar
2018-04-11 21:35:45 +00:00
deathride58 ce946619b3 Merge pull request #6348 from Citadel-Station-13/upstream-merge-37088
[MIRROR] Fix double-fullstop in the jukebox's description
2018-04-11 21:35:21 +00:00
deathride58 1f9d19a92a Merge pull request #6349 from Citadel-Station-13/upstream-merge-36983
[MIRROR] Provides more control over uplink surplus chances.
2018-04-11 21:34:56 +00:00
deathride58 6d1ee7c6e9 Merge pull request #6351 from Citadel-Station-13/upstream-merge-36604
[MIRROR] Code improvements on bullet damage decals
2018-04-11 21:34:32 +00:00
deathride58 2502bb79bf Merge pull request #6353 from Citadel-Station-13/upstream-merge-37044
[MIRROR] Fix logic circuits runtime
2018-04-11 21:32:17 +00:00
deathride58 bca8c97bdf Merge pull request #6356 from Citadel-Station-13/upstream-merge-37082
[MIRROR] Disables mood traits when mood is disabled
2018-04-11 21:31:46 +00:00
deathride58 055eacca74 Merge pull request #6358 from Citadel-Station-13/upstream-merge-37073
[MIRROR] Integrated Circuits Parameter Fixes
2018-04-11 21:31:17 +00:00
deathride58 baf8c6967d Update admins.txt 2018-04-11 17:31:04 -04:00
deathride58 dd7cf18694 Merge pull request #6359 from Citadel-Station-13/upstream-merge-37077
[MIRROR] Fixes warp whistle invis bug
2018-04-11 21:30:16 +00:00
deathride58 43eee9851c Merge pull request #6360 from Citadel-Station-13/upstream-merge-37094
[MIRROR] Fixes overlay update for washing bloody hands
2018-04-11 21:29:52 +00:00
deathride58 6c107f538a Merge pull request #6361 from Citadel-Station-13/upstream-merge-37107
[MIRROR] Fixes jukebox ghost message spam
2018-04-11 21:29:28 +00:00
deathride58 1f44356e49 Merge pull request #6364 from Citadel-Station-13/upstream-merge-37120
[MIRROR] [s] Adds a centcom level check to launchpad.
2018-04-11 21:28:50 +00:00
deathride58 72dfdb0a63 Merge pull request #6365 from Citadel-Station-13/upstream-merge-37032
[MIRROR] Forcing the human liver to actually do its job v2
2018-04-11 21:28:25 +00:00
deathride58 eebe38dc39 Merge pull request #6367 from Citadel-Station-13/upstream-merge-37136
[MIRROR] Removes some unused math defines/procs
2018-04-11 21:27:58 +00:00
deathride58 1bec758c65 Merge pull request #6369 from Citadel-Station-13/upstream-merge-37130
[MIRROR] Adds tesla coil cargo pack
2018-04-11 21:27:26 +00:00
deathride58 84a94e1894 Merge pull request #6371 from Citadel-Station-13/upstream-merge-37123
[MIRROR] Keeps SM shuttle shards from being unwrenched
2018-04-11 21:27:05 +00:00
deathride58 ba276cf374 Merge pull request #6373 from Citadel-Station-13/upstream-merge-37116
[MIRROR] Fixes order of operations math errors with gas defines.
2018-04-11 21:26:47 +00:00
deathride58 85cc5c177e Merge pull request #6374 from Citadel-Station-13/upstream-merge-37126
[MIRROR] Fixes signals being raised too soon
2018-04-11 21:26:22 +00:00
deathride58 ec64f1bd47 Merge pull request #6375 from Citadel-Station-13/upstream-merge-37000
[MIRROR] Update compile options to make 512 support official
2018-04-11 21:25:48 +00:00
deathride58 efb127e976 Merge pull request #6368 from Citadel-Station-13/upstream-merge-37139
[MIRROR] Remove 512 version checks
2018-04-11 21:25:07 +00:00
CitadelStationBot e6fb31d5e3 Update compile options to make 512 support official 2018-04-11 15:12:55 -05:00
Jordan Brown 704b42411a Merge pull request #37000 from tgstation/KorPhaeron-patch-2
Update compile options to make 512 support official
2018-04-11 15:12:55 -05:00
CitadelStationBot 3fe213ff8e Fixes signals being raised too soon 2018-04-11 15:02:31 -05:00
Jordan Brown 68e0b31cf6 Fixes signals being raised too soon 2018-04-11 15:02:30 -05:00
CitadelStationBot 0d6f0da1ff Fixes order of operations math errors with gas defines. 2018-04-11 15:02:23 -05:00
The_Dreamweaver adac58f0c2 Fixes order of operations math errors with gas defines. 2018-04-11 15:02:22 -05:00
CitadelStationBot efeeb864af Keeps SM shuttle shards from being unwrenched 2018-04-11 14:59:54 -05:00
Denton 0ada58dd4f oof 2018-04-11 14:59:54 -05:00
CitadelStationBot 3fdb874738 Adds tesla coil cargo pack 2018-04-11 14:57:30 -05:00
Denton 04f7fc5788 adds tesla coil crate 2018-04-11 14:57:30 -05:00
CitadelStationBot ff507b69ff Remove 512 version checks 2018-04-11 14:26:41 -05:00
vuonojenmustaturska d559fc1bd3 remove 512 version checks 2018-04-11 14:26:41 -05:00
CitadelStationBot 8f1d3a468f Removes some unused math defines/procs 2018-04-11 14:15:14 -05:00
ShizCalev e63553e278 Removes some unused math defines/procs 2018-04-11 14:15:14 -05:00
CitadelStationBot 37fa91fbd2 Forcing the human liver to actually do its job v2 2018-04-11 09:33:49 -05:00
Winterous 065522800a Forcing the human liver to actually do its job v2 (#37032)
* Update liver.dm

* Update liver.dm

* Update liver.dm
2018-04-11 09:33:49 -05:00
CitadelStationBot d04092dadb [s] Adds a centcom level check to launchpad. 2018-04-11 08:58:50 -05:00
Dax Dupont b6396256db [s] Adds a centcom level check to launchpad. (#37120)
* Adds a centcom level check to launchpad

* Account for space americans
2018-04-11 08:58:50 -05:00
CitadelStationBot a5fe474b85 Fixes jukebox ghost message spam 2018-04-11 07:31:57 -05:00
ShizCalev f344bc76fe Fixes jukebox ghost message spam (#37107) 2018-04-11 07:31:57 -05:00
CitadelStationBot e55b6753bd Fixes overlay update for washing bloody hands 2018-04-11 07:30:45 -05:00