ShizCalev
c2000cc31a
Fixes inconsistencies w/ energy descriptions
2017-11-18 14:18:14 -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
deathride58
d034e7dbf2
Merge pull request #3964 from Citadel-Station-13/upstream-merge-32746
...
[MIRROR] Atmos Filter/Scrubber UI update
2017-11-18 05:35:27 +00:00
deathride58
9e78bcd8f9
Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786
...
[MIRROR] Replaces a bunch of mob loops with hopefully better ones
2017-11-18 05:29:32 +00:00
deathride58
5561f50b40
TGUI recompile
2017-11-18 05:07:08 +00:00
deathride58
bb690b24ba
Update cit_crewobjectives_science.dm
2017-11-17 23:45:20 -05:00
deathride58
afce3e01b7
sHIT WRONG BRANCH - undoes edit
2017-11-17 23:43:48 -05:00
deathride58
cf34b64266
Update cit_crewobjectives_science.dm
2017-11-17 23:42:43 -05:00
deathride58
d202867730
Update carbon.dm
2017-11-17 23:23:13 -05:00
deathride58
f1818eb11b
Update death.dm
2017-11-17 23:22:02 -05:00
deathride58
127846549d
Update mass_hallucination.dm
2017-11-17 23:21:13 -05:00
deathride58
38f7b829c3
Update manifest.dm
2017-11-17 23:20:44 -05:00
deathride58
e478e5640a
Update tracking.dm
2017-11-17 23:20:15 -05:00
deathride58
1377675102
Merge pull request #3996 from deathride58/master
...
adds the sprites that didnt get mirrored in #3993
2017-11-18 04:18:10 +00:00
deathride58
674cce2d85
Merge pull request #3986 from Citadel-Station-13/upstream-merge-32804
...
[MIRROR] Add the ability to osay from the viewvar dropdown
2017-11-18 04:15:58 +00:00
deathride58
01eb052366
Merge pull request #3990 from Citadel-Station-13/upstream-merge-32767
...
[MIRROR] Make tgui use npm-cache for installing modules
2017-11-18 04:14:02 +00:00
deathride58
7c7c050cdb
adds the sprites that didnt get mirrored in #3993
2017-11-17 23:10:15 -05:00
CitadelStationBot
a1096e9724
[MIRROR] Makes TGUI's reload.bat account for spaces in username ( #3991 )
...
* Makes reload.bat account for spaces in username (#32768 )
* Makes TGUI's reload.bat account for spaces in username
2017-11-17 19:03:08 -08:00
CitadelStationBot
ade73101d7
Automatic changelog generation for PR #3993 [ci skip]
2017-11-17 21:02:43 -06:00
CitadelStationBot
0beef30fb7
Adds a purple bartender suit and apron, and Long Hair 3 - Requested and sprites by Okand37! ( #3993 )
2017-11-17 19:02:40 -08:00
CitadelStationBot
adabac95b6
Automatic changelog generation for PR #3988 [ci skip]
2017-11-17 19:42:13 -06:00
deathride58
e38670e5cb
Merge pull request #3988 from Citadel-Station-13/upstream-merge-32813
...
[MIRROR] Fixes hydroponics not properly dealing with fluorine
2017-11-18 01:42:10 +00:00
duncathan salt
52fc5e8bc6
RPD ui improvements
2017-11-17 18:03:56 -06:00
JJRcop
244e823558
Tweaks AI door open and close buttons
2017-11-17 12:53:16 -06:00
CitadelStationBot
b21ba8055e
Make tgui use npm-cache for installing modules
2017-11-17 12:51:54 -06:00
MoreRobustThanYou
98e4e38d43
Make tgui use npm-cache for installing modules ( #32767 )
2017-11-17 12:51:53 -06:00
duncathan salt
8bc84c23db
fixes scrubbers being unable to scrub
2017-11-17 12:50:42 -06:00
CitadelStationBot
d6c0adf6a2
Fixes hydroponics not properly dealing with fluorine
2017-11-17 12:50:12 -06:00
Dax Dupont
e3f172d999
Fixes hydroponics not properly dealing with fluorine ( #32813 )
...
fluorine was misspelled
2017-11-17 12:50:11 -06:00
CitadelStationBot
859f55e2c3
Add the ability to osay from the viewvar dropdown
2017-11-17 03:49:08 -06:00
oranges
a637da3b0f
Add the ability to osay from the viewvar dropdown ( #32804 )
2017-11-17 03:49:08 -06:00
CitadelStationBot
43f49c74ee
[MIRROR] adds 1 gbp to armhulen's account (grammar fix) ( #3936 )
...
* adds 1 gbp to armhulen's account (grammar fix)
* Update mind.dm
* Update mind.dm
2017-11-17 00:29:40 -08:00
CitadelStationBot
2f11412766
[MIRROR] Webhook processor will comment negative PR balances on unlabelled PRs ( #3970 )
...
* Webhook processor will comment negative PR balances on unlabelled PRs (#32771 )
* Webhook processor will comment negative PR balances on unlabelled PRs
2017-11-17 00:26:08 -08:00
CitadelStationBot
c81f4888fa
Automatic changelog generation for PR #3983 [ci skip]
2017-11-17 02:24:53 -06:00
CitadelStationBot
0d8d2c50da
[MIRROR] Remove shocker circuit ( #3983 )
...
* Remove shocker circuit (#32758 )
* Remove shocker circuit
2017-11-17 00:24:50 -08:00
CitadelStationBot
0fb192d50e
Automatic changelog generation for PR #3980 [ci skip]
2017-11-17 02:24:38 -06:00
CitadelStationBot
1453373770
[MIRROR] Nerfs power regen on the regular tesla relay circuit. ( #3980 )
...
* Nerfs power regen on the regular tesla relay circuit. (#32782 )
* nerfed power regen on both variants of tesla circuit
* lines
* ill show you consistency
* Nerfs power regen on the regular tesla relay circuit.
2017-11-17 00:24:36 -08:00
CitadelStationBot
fd12953f10
[MIRROR] New -> Initialize ( #3972 )
...
* New -> Initialize (#32777 )
* New -> Initialize
* Remove loc from Initialize
* New -> Initialize
2017-11-17 00:24:02 -08:00
deathride58
8590446197
Merge pull request #3982 from Citadel-Station-13/upstream-merge-32833
...
[MIRROR] [s] Sanitizes text input/output in circuits
2017-11-17 06:42:17 +00:00
