Commit Graph

769 Commits

Author SHA1 Message Date
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
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
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
Ghom
d53dca7322 Fixing just a couple issues. (#12417) 2020-06-02 15:30:22 -07:00
Letter N
151df41d1c asset cache + better minimaps 2020-05-31 16:15:09 +08:00
Letter N
af1aa9758d matrix and orbit thing (#12399) 2020-05-31 02:20:20 +02:00
Artur
19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
Rohesie
d88c815845 vars (#12373) 2020-05-28 01:18:26 +02:00
kevinz000
0bfe77e15a ok (#12365) 2020-05-26 15:24:23 +02:00
Ghom
07df0102f8 Demodularizing a few reagents, a client var, the rest hud button. (#12329) 2020-05-24 13:21:14 -07:00
kevinz000
e9068f05eb let's play the optimization game featuring lighting (#12310)
* debug proc

* kinda quirky

* let's play the lighting game

* let's play the macro game

* let's play the refactor game

* let's play the optimization game

* let's play the optimization game x2

* yeehaw

* e

* let's play the memory game

* fix

* lighting fix

* sanitization and checks

* mh

* hotkeys fix

* ok
2020-05-23 22:47:42 +02:00
Lin
a6d7170d5b Merge pull request #12313 from kevinz000/click_logs
[s]click logging
2020-05-23 20:21:45 +00:00
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
kevinz000
b57e1c1e93 Rebindable Hotkeys (#12138)
* demodularize interface

* keybindings

* binds

* prefs

* loose ends

* globals

* changes

* s

* datum ref lists

* ok

* fixes

* fixes

* fix

* ok

* sigh

* sigh

* indicators

* let's play the move code around game

* let's play the i didn't comma my lists game

* let's play the indent game

* let's play hte spelling bee

* let's fail the spelling bee

* LET'S PLAY THe HOW HARd  IS  IT TO SPELL A PROC GAME

* let's play the bugfix game

* bugfixes

* improvements

* Update bindings_client.dm

* pixel shift

* A

* wups
2020-05-20 23:40:20 +02:00
kevinz000
89a14a82f0 ok 2020-05-20 07:46:58 -07:00
Artur
c73295279e Fixes asset cache client 2020-05-19 19:02:46 +03:00
Ghom
08392c7ae7 Fixing horns/wings colors not being loaded, and another couple misc issues. (#12287)
* Fixing horns/wings colors not saving up and another couple misc issues.

* Typos.

* accidental paste
2020-05-18 04:47:19 -07:00
Ghom
20ac2f26f4 Demodularizing the gear loadout code a little. (#12261) 2020-05-18 04:45:50 -07:00
Ghom
335f5a37b9 Plane adjustments on several low layer objects. (#12286) 2020-05-17 17:02:57 -07:00
Ghom
7c7147cb3e Field of Vision component. (#12075)
* Hopeless WIP for vision cones.

* Core component and hooks done

* Removing clutter.

* linter bashing me for using statements as args.

* Ok.

* continue

* bring back the macro

* Configs and openspace filter.

* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.

* view, viewers and spoopy ghosts.

* Renamed component, admin fun button and snowflakes robots.

* Whoopsie.

* Yikes

* test merge tweak.

* radial yaketi sax.

* Fixed tgui UIs, some messages not displayed to the target.

* Documentation and a little bugfix.

* Pulling QoL, seventh plane made in this PR.

* Fix.

* Tweaks and improvements.

* Update randomverbs.dm
2020-05-15 15:25:04 -07:00
Artur
dabdf16eac Coonflict fiiixeeess 2020-05-13 12:56:17 +03:00
Artur
5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00