Commit Graph

61 Commits

Author SHA1 Message Date
deathride58
64aadb868e Merge branch 'master' into upstream-merge-33213 2017-12-04 21:39:30 +00:00
Ashe Higgs
5621507b4a Adds emergency lights, built into light fixtures 2017-12-03 12:54:48 -06:00
Matt Smith
a0cdca9e7c Fix turbine computer showing broken 2017-11-30 17:01:38 -06:00
Matt Smith
694958f587 Update Turbine computer to use TGUI 2017-11-21 22:28:14 -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
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
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
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
Dax Dupont
3fbe3bdd63 Makes the operation computer tgui 2017-11-16 14:29:18 -06:00
deathride58
ddb842bd1a Update portable_scrubber.ract 2017-11-16 12:52:38 -05:00
duncathan salt
043e689108 Atmos Filter/Scrubber UI update 2017-11-15 21:38:57 -06:00
AnturK
13ebff97df Fixes AI door hotkeys & other weirdness 2017-11-15 02:03:17 -06:00
LetterJay
829d981fa5 Merge pull request #3928 from Citadel-Station-13/upstream-merge-32594
[MIRROR] Update AI Airlock UI to use TGUI
2017-11-14 15:51:18 -06:00
Matt Smith
d486d784ad Update AI Airlock UI to use TGUI 2017-11-14 05:00:58 -06:00
arsserpentarium
d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
FrozenGuy5
9439d61184 Adds a missing brown gas rename. 2017-11-02 19:59:33 -05:00
as334
eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
Poojawa
7b8e88ec7e Medihound Fixes (#3462)
* fix borgs, tries new things

* TGUI experiment, Expanded resist

also cleans up some bad code we don't want to keep

* kinda important to have the right one

* I actually managed to compile tgui

* tgui fuckery

I hate UI building

* more tgui tweaks

and it finally compiles, again.

* Have I mentioned UIs are not my strong point?

Because they're really not

* updates to this shit thing.

Tgui button chem selection -> chem to inject needs to be fixed

* No.

* FUCKING, FINALLY
2017-10-21 06:15:50 -05:00
oranges
993cf948fb allows vent internal pressure bound to be set by air alarms 2017-10-14 21:10:47 -05:00
LetterJay
2918c2c20d Update atmos_filter.ract 2017-10-12 02:58:50 -05:00
duncathan salt
e61b6aecd7 unfucks filters 2017-10-12 01:07:52 -05:00
Robustin
a570ec8610 Adds the Chemistry Smoke Machine (#30920)
* Smoke Machine

* Tweak

* More responsive smoke timing

* Antur Review and Admin Logs

* Cboss review

* More logging

* Removes analyze, streamlines logs

* r-e-a

* no s in reagents_list

* Cyberboss Review

* woops

* Cboss nitpicking
2017-10-10 13:13:38 -05:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
Poojawa
9e3a1a4a0b fuck trying to install linux based bullshit scripts (#2758) 2017-09-14 06:43:11 -05:00
CitadelStationBot
083fc1a7b4 [MIRROR] Standardized power displays (#2539)
* Standardized power displays

* Update tgui.js

* Delete tgui.js.rej
2017-09-13 17:57:16 -05:00
LetterJay
14aefe2e64 commit 2017-09-11 14:01:42 -05:00
LetterJay
31102d0ec4 Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262
[MIRROR] Soft crit, except not terrible
2017-09-07 10:01:35 -05:00
LetterJay
8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
LetterJay
00199af27d Merge branch 'master' into upstream-merge-29866 2017-09-06 09:21:53 -05:00
CitadelStationBot
3e1031d6b9 Adds a ghost verb to see all available ghost spawners 2017-08-29 17:45:50 -05:00
CitadelStationBot
5eea016593 You can now click on symptoms in the Pandemic to see their description and stats 2017-08-19 18:52:55 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
5882b25b7a Rewrites Recollection and splits it into categories, rewords Hierophant Network description 2017-07-03 10:10:17 -05:00
CitadelStationBot
d1a77ef774 Ports bay's supermatter monitor modular program 2017-06-28 10:05:53 -05:00
CitadelStationBot
237691f6fd [MIRROR] Fixes problems that were in the original PR (#1419)
* Fixes problems that were in the original PR

* rej cleanup

* Wow CSS is even worse than byond
2017-06-28 03:02:50 -05:00
CitadelStationBot
65736b7e23 [MIRROR] Ports the Ore Redemption Machine to TGUI (#1414)
* Ports the Ore Redemption Machine to TGUI

* Update tgui.css

* Update tgui.js

* Delete tgui.css.rej

* Delete tgui.js.rej
2017-06-28 02:24:55 -05:00
CitadelStationBot
f36853ea75 Adds custom lighting support to modular computers, and a flashlight to tablets 2017-06-21 15:43:05 -05:00
CitadelStationBot
e0b5221ebd The Crafting Menu now has subcategories! (#1364) 2017-06-04 09:09:59 -07:00
CitadelStationBot
d7f0b9494b Ports pandemic to tgui 2017-05-21 22:28:16 -05:00
CitadelStationBot
c6a671a11b [MIRROR] Devil refactor+small revamp (#887)
* Devil refactor+small revamp

* Delete mind.dm.rej

* clean up rej

* Delete admin_investigate.dm.rej

* Delete mapping.dm.rej

* compile fix
2017-05-18 09:06:01 -05:00
CitadelStationBot
6a2916a171 [MIRROR] Bluespace Launchpads (#879)
* Bluespace Launchpads

* Delete runtimestation.dmm.rej

* Delete tgstation.dme.rej

* Delete tgui.js.rej

* Update tgui.js
2017-05-18 07:12:13 -05:00
CitadelStationBot
2eea01f671 [MIRROR] Refactor of modular PC UIs (#874)
* Refactor of modular PC UIs

* .rej fix
2017-05-18 05:22:34 -05:00
LetterJay
bdbedd33f4 Merge branch 'master' into upstream-merge-26776 2017-05-17 05:14:18 -04:00
kevinz000
005d8a8156 Lets try that again... (#868)
* TGUI GPS

* fixes .rej
2017-05-08 22:58:46 -07:00
kevinz000
77c066d93a Revert "[MIRROR] TGUI GPS" (#867)
* Revert "Automatic changelog generation for PR #608 [ci skip]"

This reverts commit 7701c39fde.

* Revert "TGUI GPS (#608)"

This reverts commit ba0f4b1c59.
2017-05-08 22:48:34 -07:00
CitadelStationBot
ba0f4b1c59 TGUI GPS (#608) 2017-05-08 22:46:42 -07:00
CitadelStationBot
56d5e12263 Moves languages to a holder datum, gives mind its own language holder 2017-05-05 08:13:04 -05:00