Commit Graph

453 Commits

Author SHA1 Message Date
silicons dc80bcaabb Merge pull request #14814 from TripleShades/delda
Delta Tweaks
2021-06-13 15:17:18 -07:00
silicons d0fc422b3a Merge pull request #14816 from SandPoot/tablet-pen-slot
Adds a pen slot for tablet computers
2021-06-13 15:16:37 -07:00
SandPoot 3321e17c6f Update NtosWindow.js
Delet unused stuff
2021-06-09 21:48:06 -03:00
SandPoot e63eac2c57 upload NtosWindow.js 2021-06-09 21:47:33 -03:00
SandPoot 79c501a7b4 upload files 2021-06-09 21:36:43 -03:00
TripleShades 0ca6e983c9 changies
delda changies good
2021-06-09 15:32:48 -04:00
silicons ec63a4c62b Merge pull request #14779 from Arturlang/Orbit_menu_antags
Makes orbit menu show antags if DNR
2021-06-09 11:17:14 -07:00
silicons 460026f3bc Merge pull request #14774 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/ws-7.4.6
Bump ws from 7.4.3 to 7.4.6 in /tgui
2021-06-09 11:15:22 -07:00
silicons 7963dce24e Merge pull request #14712 from keronshb/hereticadjustments
Minor Heretic rework and fixes (Includes shifting realities and more)
2021-06-09 11:12:23 -07:00
silicons 716c2a04e4 Merge pull request #14160 from keronshb/motivation
Adds a new traitor item, Motivation (Part 1)
2021-06-09 11:10:17 -07:00
Artur 8687312935 Makes orbit menu show antags if DNR 2021-05-31 18:14:06 +03:00
dependabot[bot] 5563ed1492 Bump ws from 7.4.3 to 7.4.6 in /tgui
Bumps [ws](https://github.com/websockets/ws) from 7.4.3 to 7.4.6.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/7.4.3...7.4.6)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-30 17:06:12 +00:00
keronshb bdd42c728d Adds a missing space 2021-05-13 13:21:34 -04:00
keronshb 21ca62a2e2 FINALLY fixes the comma, I think
Time to try
2021-05-12 14:54:44 -04:00
keronshb 0841cea1d5 I still have no idea what's messing with this 2021-05-12 13:17:23 -04:00
keronshb 0185007e6c adding ; to line 25 2021-05-11 19:33:53 -04:00
keronshb 0cb6f2469b Have no idea... 2021-05-11 18:39:36 -04:00
keronshb 8c7c41bfd4 Fixes the comma, I think 2021-05-11 18:17:41 -04:00
keronshb 1de8b69312 Fixes the linter
Fixes the linter
2021-05-11 18:10:27 -04:00
keronshb 4749be2ba8 Final rework
Last part.
2021-05-11 16:52:16 -04:00
silicons 986aef27b2 Merge pull request #14648 from SandPoot/decal-painter-tgui
Decal Painter menu is no longer shit and has visible previews.
2021-04-28 21:20:24 -06:00
silicons 4f73557168 Merge pull request #14647 from SandPoot/limb-grower-tgui
Ports TGUI limb grower from tg
2021-04-28 21:20:01 -06:00
SandPoot 3438da2b44 indentation part 1 2021-04-23 19:43:20 -03:00
SandPoot f40f4c8257 upload files 2021-04-23 19:30:28 -03:00
SandPoot b386d3826a tgui part 1 2021-04-23 13:22:59 -03:00
SandPoot e6c23728eb upload files 2021-04-23 12:56:11 -03:00
SandPoot 5bb6078def upload files 2021-04-22 20:39:21 -03:00
silicons 9f032df236 Merge pull request #14608 from TheObserver-sys/TheHoldoutUpdate
The Holdout Update: How I learned to stop whining, and aim a pocket pistol.
2021-04-18 18:50:37 -06:00
silicons 30fd90a87c Merge pull request #14606 from SandPoot/cloning-machine-tgui
TGUIZES the cloning computer
2021-04-17 17:00:49 -06:00
SandPoot 7f097182e8 OperatingComputer.js (#14611) 2021-04-16 18:01:51 +02:00
keronshb 20c190c17d Merge remote-tracking branch 'upstream/master' into motivation 2021-04-14 17:55:24 -04:00
keronshb bb047bd57e dunno why this is here
dunno why this is here
2021-04-14 17:54:33 -04:00
SandPoot 5bb3933d55 indentation part 5 2021-04-13 17:56:49 -03:00
SandPoot be8cf11b69 indentation part 4 2021-04-13 17:53:35 -03:00
SandPoot 1f049edb10 indentation part 3 2021-04-13 17:46:32 -03:00
SandPoot d0afa223bc indentation part 2 2021-04-13 17:41:20 -03:00
SandPoot 91ae125ac4 indentation part 1 2021-04-13 17:34:32 -03:00
SandPoot 330a3b8c9a upload files 2021-04-13 17:25:08 -03:00
Blue Wildrose 8b47786556 Pirate stuff and comm console fixes 2021-04-13 00:53:55 -07:00
The0bserver bdaf0987e4 im going insane 2021-04-11 05:31:23 -04:00
qweq12yt 381baf32af fixes size for the window 2021-03-19 17:01:57 -03:00
qweq12yt 60a720eead ok so now it works 2021-03-19 16:10:54 -03:00
qweq12yt 27774c4209 git is acting weird.jpg 2021-03-19 16:10:17 -03:00
Letter N de6f1401bb final fix 2021-03-08 13:24:28 +08:00
Letter N 8c3c259850 pepegasort 2021-03-07 14:11:09 +08:00
Letter N 34697acf74 missing icon fix & stop throwing out parts 2021-03-05 19:29:52 +08:00
Letter N c6d1ddad10 uhh ok yarn 2021-03-04 22:06:43 +08:00
Letter N dcab40cdb6 building pipeline 2021-03-04 21:51:20 +08:00
Letter N 5897cfd97b when tgui
subscript text
2021-03-04 16:39:44 +08:00
Letter N 2be4c76add THIS FIXES IT (well it should :) ) 2021-02-22 21:05:07 +08:00