shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,509 Commits 5 Branches 0 Tags
70525101654cefada87ff6bbcaee4d6abebf06fb
Commit Graph
73 Commits
Author SHA1 Message Date
deathride58 7280d91628 Minor boxstation changes, merges #4694 and #4697 2018-01-08 00:55:05 -05:00
LeoandCitadelStationBot 889e281a57 Revert "Vending TGUI" 2017-12-26 09:10:48 -06:00
Jordan BrownandCitadelStationBot 95354a388f Vending TGUI 2017-12-24 15:03:38 -06:00
LetterJayandGitHub 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
LetterJay aaeb9331f5 tgui recompile 2017-12-10 14:19:39 -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
LetterJay efceed4277 tgui 2017-12-03 06:09:42 -06:00
deathride58 b90b18cc27 recompiles tgui 2017-11-22 15:38:43 -05:00
deathride58 d6efdbee86 Recompiles TGUI 2017-11-18 01:45:19 -05:00
deathride58andGitHub 5561f50b40 TGUI recompile 2017-11-18 05:07:08 +00:00
duncathan saltandCitadelStationBot 043e689108 Atmos Filter/Scrubber UI update 2017-11-15 21:38:57 -06:00
Poojawa 9ea743f0cd update tgui 2017-11-15 09:33:00 -06:00
LetterJay 1dbf2173ab recompiles gui 2017-11-14 13:35:01 -06:00
Poojawa 5de28f6eb8 updates tgui 2017-11-09 16:02:07 -06:00
FrozenGuy5andCitadelStationBot 9439d61184 Adds a missing brown gas rename. 2017-11-02 19:59:33 -05:00
PoojawaandGitHub 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
LetterJayandGitHub 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
duncathan saltandCitadelStationBot c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
RobustinandCitadelStationBot 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 HiggsandCitadelStationBot e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
PoojawaandGitHub 9e3a1a4a0b fuck trying to install linux based bullshit scripts (#2758) 2017-09-14 06:43:11 -05:00
CitadelStationBotandPoojawa 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 8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
kevinz000 c9280bd308 sync 2017-08-29 22:12:19 -07:00
CitadelStationBot 3e1031d6b9 Adds a ghost verb to see all available ghost spawners 2017-08-29 17:45:50 -05:00
CitadelStationBot cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
PoojawaandGitHub b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
PoojawaandGitHub db6d92c108 Delete tgui.js.rej 2017-07-05 09:00:44 -05:00
PoojawaandGitHub 9e4d948aa2 Delete tgui.css.rej 2017-07-05 09:00:13 -05:00
LetterJayandGitHub 19cee66fc5 Update tgui.js 2017-07-03 12:03:46 -05:00
CitadelStationBot 5882b25b7a Rewrites Recollection and splits it into categories, rewords Hierophant Network description 2017-07-03 10:10:17 -05:00
LetterJayandGitHub 447a81bcad Update tgui.js 2017-06-29 04:37:52 -05:00
CitadelStationBot d1a77ef774 Ports bay's supermatter monitor modular program 2017-06-28 10:05:53 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
Poojawa 789064a3a5 Clean up .rej files 2017-06-28 02:24:03 -05:00
LetterJayandGitHub 039dcb464f Delete tgui.js.rej 2017-06-26 23:18:08 -05:00
LetterJayandGitHub b44d1d721b Update tgui.js 2017-06-26 23:15:48 -05:00
CitadelStationBot f36853ea75 Adds custom lighting support to modular computers, and a flashlight to tablets 2017-06-21 15:43:05 -05:00
LetterJay e8b9b741eb evil powers 2017-06-12 22:35:47 -05:00
LetterJayandGitHub d34606ab57 Revert "dark magic [tgui]" 2017-06-10 22:40:41 -05:00
LetterJayandGitHub 1ec7cfaba0 Create tgui.js 2017-06-10 14:11:20 -05:00
LetterJay 3d750adbd7 master cleanup 2017-06-05 22:50:31 -05:00
CitadelStationBotandkevinz000 e0b5221ebd The Crafting Menu now has subcategories! (#1364) 2017-06-04 09:09:59 -07:00
LetterJayandGitHub 0b1a680d1a Merge pull request #1087 from Citadel-Station-13/upstream-merge-27480 
[MIRROR] Ports pandemic to tgui
 2017-05-23 06:13:41 -05:00