Commit Graph

789 Commits

Author SHA1 Message Date
silicons
4832069181 Update preferences_savefile.dm 2020-07-20 18:57:09 -07:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
2020-07-16 17:28:42 -07:00
Letter N
2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
Artur
d0f1a805e4 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-14 16:15:48 +03:00
Lin
55c4e40fbb Merge pull request #12706 from silicons/records
adds security/medical records to character setup
2020-07-13 11:50:02 -05:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
silicons
f7b476bc64 Update preferences.dm 2020-07-11 21:23:06 -07:00
Timothy Teakettle
02f46322ad port examine 2020-07-09 18:32:45 +01:00
silicons
22c3d9fe3e ok 2020-07-07 21:07:13 -07:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
silicons
6634e43be4 fix 2020-07-07 07:41:33 -07:00
silicons
cee15792b7 ok 2020-07-07 07:25:10 -07:00
Ghom
bc5e7d1513 Merge pull request #12688 from Weblure/small-strides-fix
[READY] Fixes Small Strides Formula
2020-07-06 22:48:09 +02:00
Ghom
871993ce14 Merge pull request #12593 from silicons/autobunker
adds verb to auto bunker override on linked servers
2020-07-04 18:36:59 +02:00
silicons
03aa8fcc2b Update autobunker.dm 2020-07-04 00:14:32 -07:00
silicons
ae5fb008c7 Update client_defines.dm 2020-07-04 00:13:34 -07:00
Weblure
832bea9ca5 Fixed sentence formatting, removed Skyrat comments 2020-07-03 21:55:42 -07:00
Weblure
c9ec6d4a03 Fixes a button, rewords text to be clearer 2020-07-03 21:51:22 -07:00
Artur
f0154f3f1c conflicts!!! 2020-07-03 15:45:11 +03:00
Artur
365aadec54 Trying to fix the dna t 2020-07-03 00:55:18 +03:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Ghom
e586d03e0a text spans. 2020-07-02 19:47:05 +02:00
Ghom
c919075aca Thanks Timothy. 2020-07-02 19:46:10 +02:00
Ghom
4354b0bf6f Actually fixing a dum dum feature. 2020-07-02 19:26:52 +02:00
silicons
5f11612078 Update preferences_savefile.dm 2020-07-02 03:00:35 -07:00
Ghommie
94f7dae62e Porting "Fix asset cache verification" and other tiny bits. 2020-07-01 16:24:12 +02:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghom
3c4a288ecc Merge pull request #12625 from Citadel-Station-13/silicons-patch-9
maybe fixes edge cases where half the server has their client input system broken
2020-06-30 00:21:42 +02:00
silicons
d6a7f91b81 Update autobunker.dm 2020-06-29 04:45:05 -07:00
silicons
30a4bb5683 Update client_procs.dm 2020-06-27 01:20:15 -07:00
Timothy Teakettle
97dbd9cedf better customization 2020-06-24 21:44:48 +01:00
silicons
b367f76c62 autobunker 2020-06-24 07:49:45 -07:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Ghom
e31ce2edcf Merge pull request #12414 from LetterN/asset-cache-thing
asset cache + better minimaps
2020-06-19 23:09:09 +02:00
Artur
bac16dbf61 Trying to fix the examine bug.. 2020-06-17 16:13:10 +03:00
Artur
ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
Ghom
7513e032e3 petrification improvements (#12375)
* petrification improvements

* Standards.
2020-06-14 23:04:12 -07:00
deathride58
513ed1ab47 Fixes a major HTML injection vulnerability with flavortext by making flavortext store itself as encoded html instead of decoded html (#12513) 2020-06-12 15:17:32 -07:00
deathride58
245bf750c7 fixes a pair of dos vectors. this is apparently a day -1 patch! (#12511) 2020-06-12 11:54:18 -07:00
Artur
b6dc41b852 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-09 11:07:39 +03:00
kevinz000
0e2fb9801e woops 2020-06-05 00:59:18 -07:00
kevinz000
7891c77ea9 text2num 2020-06-05 00:41:48 -07:00
kevinz000
ee2a2ad017 fix 2020-06-05 00:24:01 -07:00
kevinz000
a2d131646f sigh 2020-06-05 00:01:02 -07:00
kevinz000
26b541dc42 css sucks 2020-06-04 23:41:40 -07:00
kevinz000
ee5b209932 eh 2020-06-04 23:27:50 -07:00
kevinz000
87dc0e0823 sigh 2020-06-04 23:22:17 -07:00
kevinz000
51a1eeb9de sigh 2020-06-04 23:18:31 -07:00
kevinz000
29302c51ed ok 2020-06-04 22:58:42 -07:00
Yawet330
fabfd684ce Silicon Flavortexts. (SCRUTINISE HEAVILY) (#12395)
* Part 1 - Adding the component

* Part 2 - Making the WRITE_FILE before changing the pref menu.

* Part 3 - Mirroring existing code, instead of tacking it on because im both lazy, and want a distinction

* Part 4 - Changes the preference tab to accomodate this.

* we made a brief fucky wucky!

* make it look noice

* fuckywucky mk2

* Part 5 - make it apart of the helper list (woops)

* that'yll do it.

* maybe fix?

* nope, just hit the delete button on their flavortext entirely :agony:

* Update preferences_savefile.dm

* Update silicon.dm

* Update preferences.dm

* Update silicon.dm
2020-06-04 15:53:39 -07:00