Enric Gabriel
d85ebed8db
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-09-16 16:22:36 -03:00
timothyteakettle
2bb19003a0
thanks kevin
2020-09-07 01:47:30 +01:00
Timothy Teakettle
4bbec8eae1
travis lets be friends
2020-09-04 12:45:23 +01:00
timothyteakettle
fc0e8e31fc
yeah dont brick data again holy shit
2020-09-03 22:51:56 +01:00
timothyteakettle
90eef6efc9
Merge remote-tracking branch 'upstream/master' into limbs
2020-09-03 22:46:32 +01:00
timothyteakettle
594fd17f23
test
2020-09-02 15:34:13 +01:00
Enric Gabriel
ec8c53071c
removes this port as cit has their own now.
2020-09-01 13:31:55 -03:00
Enric Gabriel
d04a499179
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-09-01 11:40:44 -03:00
timothyteakettle
a9ec2254ba
hide your ckey
2020-08-31 01:47:49 +01:00
Enric Gabriel
0db4397e7c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-27 14:07:17 -03:00
Timothy Teakettle
fe25046410
Merge branch 'master' into limbs
2020-08-27 18:06:35 +01:00
Timothy Teakettle
bc2c658395
json
2020-08-27 18:01:08 +01:00
silicons and GitHub
857c581931
Merge pull request #13232 from timothyteakettle/is-this-a-good-idea
...
adds the ability to pick body sprites (you can choose aquatic/avian sprites as anthromorphs!)
2020-08-27 09:55:26 -07:00
timothyteakettle
cd7293a9a2
limbs
2020-08-24 03:19:36 +01:00
timothyteakettle
613880b9b0
saves and moths
2020-08-21 23:32:43 +01:00
Enric Gabriel
b0662f5e39
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-21 02:19:20 -03:00
Timothy Teakettle and GitHub
88fb9d277a
fix lizard snouts ( #13223 )
2020-08-20 22:58:54 +02:00
Enric Gabriel
7898f1fe3e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-16 23:24:11 -03:00
SandPoot and GitHub
518c70e6ed
Some Cit reverts and skyrat features. ( #46 )
2020-08-15 13:29:50 -03:00
timothyteakettle
8b4fb136b2
ok fuck it
2020-08-14 02:37:08 +01:00
timothyteakettle
a9caceb001
insect fluff!
2020-08-14 02:27:54 +01:00
Timothy Teakettle
e5d48e307a
woops
2020-08-12 17:04:37 +01:00
Timothy Teakettle
82298fd56c
yes
2020-08-12 17:03:23 +01:00
Enric Gabriel
55a116fd76
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-07 21:24:04 -03:00
timothyteakettle
e773062b9a
reverse the loadout update
2020-08-07 03:58:19 +01:00
timothyteakettle
2001c589c4
fuck
2020-08-05 23:28:13 +01:00
timothyteakettle
4cc3ca2193
lets try that again
2020-08-05 23:27:47 +01:00
timothyteakettle
3740e40256
sorry travis
2020-08-02 23:25:00 +01:00
Timothy Teakettle
c1f2ef3b38
we can try
2020-08-02 20:46:15 +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
Lin and GitHub
02add89513
Merge pull request #12846 from Citadel-Station-13/silicons-patch-42
...
it would be real lovely if the server didn't nuke 40 people's characters because the configuration couldn't be loaded because i really hate dll memes
2020-07-23 13:29:18 -05:00
Lin and GitHub
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
silicons and GitHub
4832069181
Update preferences_savefile.dm
2020-07-20 18:57:09 -07:00
Timothy Teakettle
a4478b0cda
it continues
2020-07-17 22:38:28 +01: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
silicons
22c3d9fe3e
ok
2020-07-07 21:07:13 -07: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 Gabriel
31738b0c8b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-07-03 09:41:42 -03:00
Ghom and GitHub
4354b0bf6f
Actually fixing a dum dum feature.
2020-07-02 19:26:52 +02:00
Enric Gabriel
1207761468
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-07-02 13:56:39 -03:00
silicons and GitHub
5f11612078
Update preferences_savefile.dm
2020-07-02 03:00:35 -07:00
Enric Gabriel and GitHub
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
deathride58 and GitHub
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
0e2fb9801e
woops
2020-06-05 00:59:18 -07:00
kevinz000
29302c51ed
ok
2020-06-04 22:58:42 -07:00
Yawet330 and GitHub
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
kevinz000 and GitHub
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
Enric Gabriel