CitadelStationBot
f2bbc29879
Fixes whiteship ruin board swap
2017-11-19 21:04:11 -06:00
ShizCalev
ede0a105e5
Fixes whiteship ruin board swap ( #32869 )
2017-11-19 21:04:11 -06:00
deathride58
ac4ca767d0
Merge pull request #3987 from deathride58/manualmirror1
...
Manual mirror of https://github.com/tgstation/tgstation/pull/32496
2017-11-19 07:47:33 +00:00
deathride58
3dcd88b975
Merge pull request #4009 from Citadel-Station-13/upstream-merge-32788
...
[MIRROR] Fixes inconsistencies w/ energy descriptions
2017-11-19 05:16:15 +00:00
CitadelStationBot
6fbf813bc9
Automatic changelog generation for PR #4010 [ci skip]
2017-11-18 22:33:10 -06:00
deathride58
711ca534d9
Merge pull request #4010 from Citadel-Station-13/upstream-merge-32851
...
[MIRROR] Fixes suicidal blobbernauts
2017-11-19 04:33:08 +00:00
deathride58
6a05a54c96
Update cell.dm
2017-11-18 23:31:32 -05:00
CitadelStationBot
fd6d265363
Automatic changelog generation for PR #4008 [ci skip]
2017-11-18 22:29:09 -06:00
deathride58
75adfdc245
Merge pull request #4008 from Citadel-Station-13/upstream-merge-32814
...
[MIRROR] fix 'cannot scream while unconscious' bug
2017-11-19 04:29:07 +00:00
deathride58
8c64f1cc49
Merge pull request #4006 from Citadel-Station-13/upstream-merge-32837
...
[MIRROR] Fixes topic logs exposing serviceCommsKey
2017-11-19 04:28:21 +00:00
CitadelStationBot
902373f003
Automatic changelog generation for PR #4005 [ci skip]
2017-11-18 22:27:46 -06:00
deathride58
68d9e90f96
Merge pull request #4005 from Citadel-Station-13/upstream-merge-32811
...
[MIRROR] Fix for list pin in integrated circuits
2017-11-19 04:27:43 +00:00
deathride58
2faceb1209
Merge pull request #4004 from Citadel-Station-13/upstream-merge-32812
...
[MIRROR] Fixes setup failure edge case
2017-11-19 04:26:49 +00:00
deathride58
7f7d282383
Merge pull request #4003 from Citadel-Station-13/upstream-merge-32843
...
[MIRROR] Removes duplicate data for ai airlock menu
2017-11-19 04:26:15 +00:00
deathride58
a00a82c1a2
Merge pull request #4002 from Citadel-Station-13/upstream-merge-32840
...
[MIRROR] Cleans up unused circuitry code
2017-11-19 04:25:43 +00:00
CitadelStationBot
936ccf61b5
Automatic changelog generation for PR #4001 [ci skip]
2017-11-18 22:25:16 -06:00
deathride58
6b56c03354
Merge pull request #4001 from Citadel-Station-13/upstream-merge-32831
...
[MIRROR] Fix runtimes when stacking pizza boxes
2017-11-19 04:25:14 +00:00
CitadelStationBot
ab38a0a8f7
Automatic changelog generation for PR #4000 [ci skip]
2017-11-18 22:24:36 -06:00
deathride58
646875ba4a
Merge pull request #4000 from Citadel-Station-13/upstream-merge-32822
...
[MIRROR] Updates modular computer Nanotrasen logo
2017-11-19 04:24:33 +00:00
CitadelStationBot
3f3c8dc530
Fixes suicidal blobbernauts
2017-11-18 18:37:50 -06:00
KorPhaeron
47b9cc2051
Fixes suicidal blobbernauts ( #32851 )
...
* Fixes suicidal blobbernauts
* Removes notransform
2017-11-18 18:37:50 -06:00
ShizCalev
c2000cc31a
Fixes inconsistencies w/ energy descriptions
2017-11-18 14:18:14 -06:00
CitadelStationBot
6216e5ec85
fix 'cannot scream while unconscious' bug
2017-11-18 13:52:36 -06:00
checkraisefold
e3036f6eae
fix 'cannot scream while unconscious' bug ( #32814 )
...
* fix 'cannot scream while unconscious' bug
fixes a bug where it tells you that you can't scream while unconscious while on fire (experienced on Bagil when a plasma fire happened at endround shuttle)
* Update species.dm
* sanitize code
* add the comment back so people know what it doin
* change operator
other one wouldn't work with the fix, the screaming is supposed to happen while you're in crit
2017-11-18 13:52:36 -06:00
CitadelStationBot
7af80364ae
Fixes topic logs exposing serviceCommsKey
2017-11-18 13:52:08 -06:00
Jordan Brown
8b7e3b7b7c
Fixes topic logs exposing serviceCommsKey ( #32837 )
2017-11-18 13:52:08 -06:00
CitadelStationBot
93d397863b
Fix for list pin in integrated circuits
2017-11-18 13:51:53 -06:00
arsserpentarium
15c65004ca
Fix for list pin in integrated circuits ( #32811 )
...
* Update lists.dm
* Update pins.dm
* Update list_pin.dm
* Update power.dm
* Update input.dm
* Update pins.dm
* Update list_pin.dm
* Update input.dm
* Update lists.dm
* Update power.dm
* Update input.dm
* Update power.dm
2017-11-18 13:51:53 -06:00
CitadelStationBot
f2a39d438f
Fixes setup failure edge case
2017-11-18 13:51:40 -06:00
AnturK
e5edaa4656
Fixes setup failure edge case ( #32812 )
2017-11-18 13:51:40 -06:00
CitadelStationBot
7bffcdca71
Removes duplicate data for ai airlock menu
2017-11-18 13:51:27 -06:00
JJRcop
ca9834613c
Removes duplicate data for ai airlock menu ( #32843 )
2017-11-18 13:51:27 -06:00
CitadelStationBot
ac6e2b84dd
Cleans up unused circuitry code
2017-11-18 13:51:14 -06:00
ShizCalev
88da7f3d30
Cleans up unused circuitry code ( #32840 )
2017-11-18 13:51:14 -06:00
CitadelStationBot
63492a74ed
Fix runtimes when stacking pizza boxes
2017-11-18 13:51:01 -06:00
Tad Hardesty
3914765c70
Fix runtimes when stacking pizza boxes ( #32831 )
2017-11-18 13:51:01 -06:00
CitadelStationBot
d8ecd60532
Updates modular computer Nanotrasen logo
2017-11-18 13:50:45 -06:00
ShizCalev
8784aa9a45
Updates modular computer Nanotrasen logo ( #32822 )
2017-11-18 13:50:45 -06:00
deathride58
c4eb49994f
Merge pull request #3997 from deathride58/tguirecompile1
...
Recompiles TGUI
2017-11-18 06:52:07 +00:00
deathride58
d6efdbee86
Recompiles TGUI
2017-11-18 01:45:19 -05:00
deathride58
2da39b5890
Merge pull request #3989 from Citadel-Station-13/upstream-merge-32823
...
[MIRROR] fixes scrubbers being unable to scrub
2017-11-18 06:38:39 +00:00
deathride58
a8783e5d1f
Merge branch 'master' into upstream-merge-32823
2017-11-18 06:06:14 +00:00
CitadelStationBot
c836f6e6bb
Automatic changelog generation for PR #3994 [ci skip]
2017-11-17 23:40:15 -06:00
deathride58
1d841ce65a
Merge pull request #3994 from Citadel-Station-13/upstream-merge-32736
...
[MIRROR] RPD ui improvements
2017-11-18 05:40:13 +00:00
CitadelStationBot
5b9fb18f5b
Automatic changelog generation for PR #3992 [ci skip]
2017-11-17 23:39:24 -06:00
deathride58
a15007cd5a
Merge pull request #3992 from Citadel-Station-13/upstream-merge-32761
...
[MIRROR] Tweaks AI door open and close buttons
2017-11-18 05:39:22 +00:00
CitadelStationBot
f758b058b6
Automatic changelog generation for PR #3967 [ci skip]
2017-11-17 23:39:03 -06:00
deathride58
04d290aa11
Merge pull request #3967 from Citadel-Station-13/upstream-merge-32775
...
[MIRROR] Makes the operation computer tgui
2017-11-18 05:38:59 +00:00
deathride58
5f055aa492
Update vent_scrubber.dm
2017-11-18 00:36:11 -05:00
CitadelStationBot
e4564b36be
Automatic changelog generation for PR #3964 [ci skip]
2017-11-17 23:35:29 -06:00
