cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-28 15:49:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
423 Commits
Author SHA1 Message Date
Timothy Teakettle f2c1b25119 yes 2020-08-05 15:50:25 +01:00
Timothy Teakettle 1f62a4bbf9 typo 2020-08-05 15:29:07 +01:00
Timothy Teakettle 8effb219e1 fix a bug and reduce it by 1 more line 2020-08-05 15:27:48 +01:00
Timothy Teakettle 5297700340 snowflake coders are bad 2020-08-05 14:11:40 +01:00
Enric Gabriel 8558cc8747 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-04 01:48:59 -03:00
siliconsandGitHub a4132c04ea Merge pull request #12894 from timothyteakettle/wounds-part-2 
port of wounds part 2
 2020-08-03 14:43:07 -07:00
Enric Gabriel 67ae58c6aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-03 12:58:06 -03:00
Timothy Teakettle f7093f2f84 yes 2020-08-02 17:32:13 +01:00
zerothebigboy 34a8d8f798 a 2020-08-02 01:38:23 -04:00
timothyteakettle 8d63714f3a make tongue preference dna 2020-07-31 23:04:29 +01:00
Timothy Teakettle f901aa9d42 travis work 2020-07-29 21:48:47 +01:00
Timothy Teakettle d5ac2dcd74 debug remove 2020-07-29 18:26:35 +01:00
Timothy Teakettle b5a16d8945 MORE CLOTHES 2020-07-29 18:20:46 +01:00
Timothy Teakettle 31963b32a4 subcategories cool 2020-07-29 17:14:07 +01:00
timothyteakettle c15d0de20d subcategories work 2020-07-29 03:57:16 +01:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
Enric Gabriel e0fdf3dce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 / merge conflicts 2020-07-23 19:14:58 -03:00
silicons 03f0d76a8e yeah ok 2020-07-23 13:23:45 -07:00
LinandGitHub 6fca9af0ed Merge pull request #12848 from silicons/morecolors 
species customization now allows 16 million colors instead of 4 thousand
 2020-07-23 13:28:50 -05:00
silicons 87d53957bf sigh 2020-07-20 20:09:13 -07:00
Timothy Teakettle a4478b0cda it continues 2020-07-17 22:38:28 +01:00
Enric Gabriel 485d7b3fec i don't... just why? 2020-07-13 20:08:45 -03:00
Enric Gabriel 674af2dc86 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-13 17:30:11 -03:00
siliconsandGitHub f7b476bc64 Update preferences.dm 2020-07-11 21:23:06 -07:00
Enric Gabriel 11883281e1 removes a rogue button and moves an option 2020-07-11 22:50:33 -03:00
silicons 6634e43be4 fix 2020-07-07 07:41:33 -07:00
silicons cee15792b7 ok 2020-07-07 07:25:10 -07:00
Enric Gabriel 9c43c980cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-06 19:20:20 -03:00
Enric Gabriel 22eba9a026 breaks a line 2020-07-04 21:45:44 -03:00
Enric Gabriel 961a217691 holy shit, there's so much stuff here, so... idk exactly what it does 2020-07-04 21:39:32 -03:00
Enric Gabriel ee00138850 if you don't want a spotlight in you, that's okay 2020-07-04 17:42:04 -03:00
Enric GabrielandGitHub ad48e8a05c the interactions (#20) 2020-07-04 17:04:58 -03:00
WeblureandGitHub 832bea9ca5 Fixed sentence formatting, removed Skyrat comments 2020-07-03 21:55:42 -07:00
WeblureandGitHub c9ec6d4a03 Fixes a button, rewords text to be clearer 2020-07-03 21:51:22 -07:00
Enric Gabriel 31738b0c8b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-03 09:41:42 -03:00
GhomandGitHub e586d03e0a text spans. 2020-07-02 19:47:05 +02:00
GhomandGitHub c919075aca Thanks Timothy. 2020-07-02 19:46:10 +02:00
Enric GabrielandGitHub 72f993fdbd Pulls #1706 from Skyrat (#18) 2020-07-02 02:20:27 -03:00
Timothy Teakettle 97dbd9cedf better customization 2020-06-24 21:44:48 +01:00
deathride58andGitHub 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
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
Yawet330andGitHub 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
GhomandGitHub d53dca7322 Fixing just a couple issues. (#12417) 2020-06-02 15:30:22 -07:00