Commit Graph

404 Commits

Author SHA1 Message Date
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
LetterJay
aaeb9331f5 tgui recompile 2017-12-10 14:19:39 -06:00
Ashe Higgs
0ae0c44991 Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more 2017-12-06 16:37:15 -06:00
deathride58
ff93a0cd6c rebuilds tgui correctly 2017-12-04 16:56:14 -05:00
deathride58
8a75e55b42 Merge branch 'upstream-merge-33213' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33213 2017-12-04 16:54:32 -05:00
deathride58
9cdaac3640 updates tgui and adds the missing lighting.dmi 2017-12-04 16:53:49 -05:00
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
LetterJay
efceed4277 tgui 2017-12-03 06:09:42 -06:00
Matt Smith
a0cdca9e7c Fix turbine computer showing broken 2017-11-30 17:01:38 -06:00
deathride58
b90b18cc27 recompiles tgui 2017-11-22 15:38:43 -05:00
Matt Smith
694958f587 Update Turbine computer to use TGUI 2017-11-21 22:28:14 -06:00
deathride58
d6efdbee86 Recompiles TGUI 2017-11-18 01:45:19 -05: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
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
5561f50b40 TGUI recompile 2017-11-18 05:07:08 +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
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
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
MoreRobustThanYou
98e4e38d43 Make tgui use npm-cache for installing modules (#32767) 2017-11-17 12:51:53 -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
CitadelStationBot
d29bae26e0 Merge pull request #3954 from Citadel-Station-13/upstream-merge-32737
[MIRROR] Fixes AI door hotkeys & other weirdness
2017-11-15 11:08:25 -06:00
Poojawa
9ea743f0cd update tgui 2017-11-15 09:33:00 -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
LetterJay
1dbf2173ab recompiles gui 2017-11-14 13:35:01 -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
Poojawa
5de28f6eb8 updates tgui 2017-11-09 16:02:07 -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
41846d0793 Merge branch 'master' into upstream-merge-31599 2017-10-12 11:00:37 -04:00
LetterJay
4a8f3d0e41 fuck this shit 2017-10-12 09:58:16 -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
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -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