 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 |
|
|
SandPoot
|
41e2a0356a
|
Moves pref menu stuff again (#62)
|
2020-09-04 15:28:59 -03: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
|
798e11c407
|
logic
|
2020-09-03 22:36:38 +01:00 |
|
|
timothyteakettle
|
9e2ee588c9
|
rp prosthetics
|
2020-09-03 22:05:21 +01:00 |
|
|
SandPoot
|
3f6733fc72
|
Ports tgstation/53371 (#60)
|
2020-09-03 16:43:42 -03: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 |
|
|
silicons
|
77cf561f7f
|
Merge pull request #13316 from timothyteakettle/ckey-pref
pref for hiding your ckey from roundend report
|
2020-08-31 21:19:37 -07:00 |
|
|
timothyteakettle
|
af2c7b295e
|
ah yes
|
2020-08-31 02:25:54 +01:00 |
|
|
timothyteakettle
|
a9ec2254ba
|
hide your ckey
|
2020-08-31 01:47:49 +01:00 |
|
|
Enric Gabriel
|
c10471fac9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-30 01:42:29 -03:00 |
|
|
silicons
|
5f7d80eab2
|
Merge pull request #13281 from Putnam3145/examine-pref
Added genital/vore examine text prefs
|
2020-08-29 21:19:03 -07:00 |
|
|
Letter N
|
ae482c1bb8
|
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
|
2020-08-29 14:09:56 +08:00 |
|
|
Putnam
|
c7883775fa
|
Added a pref to see genitals on examine.
|
2020-08-27 20:22:24 -07: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
|
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 |
|
|
Enric Gabriel
|
4028af4f4f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-26 12:24:38 -03:00 |
|
|
Timothy Teakettle
|
d877a8c0fb
|
qol (#13250)
|
2020-08-26 14:14:19 +02:00 |
|
|
timothyteakettle
|
cd7293a9a2
|
limbs
|
2020-08-24 03:19:36 +01:00 |
|
|
Enric Gabriel
|
78124ace3f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-23 12:54:24 -03:00 |
|
|
Letter N
|
2ddddbbbaa
|
input moment
|
2020-08-23 22:07:26 +08:00 |
|
|
silicons
|
2fa023346a
|
Merge pull request #13204 from timothyteakettle/donator-items
adds three t1 donator items
|
2020-08-23 05:08:50 -07:00 |
|
|
Letter N
|
0b159b218a
|
revert moment
|
2020-08-22 16:30:56 +08:00 |
|
|
Letter N
|
317480a3e7
|
something something skin texture revert. oh and oh fuck shit passkeys works again.
|
2020-08-22 15:07:02 +08:00 |
|
|
Letter N
|
afe32406c0
|
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
|
2020-08-22 13:40:36 +08:00 |
|
|
timothyteakettle
|
613880b9b0
|
saves and moths
|
2020-08-21 23:32:43 +01:00 |
|
|
timothyteakettle
|
a75d91299a
|
yep
|
2020-08-21 23:16:44 +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 |
|
|
timothyteakettle
|
709ddb4e58
|
test
|
2020-08-21 03:48:30 +01:00 |
|
|
Timothy Teakettle
|
88fb9d277a
|
fix lizard snouts (#13223)
|
2020-08-20 22:58:54 +02:00 |
|
|
Letter N
|
3b7bca28b3
|
Functional* code
|
2020-08-20 13:50:33 +08:00 |
|
|
Enric Gabriel
|
600c3b3528
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-18 23:31:57 -03:00 |
|
|
Timothy Teakettle
|
264e789c3d
|
yes
|
2020-08-18 17:38:20 +01:00 |
|
|
Timothy Teakettle
|
6392367df4
|
donator items
|
2020-08-18 17:28:09 +01:00 |
|
|
Letter N
|
5dff3e9a04
|
deletes ping
|
2020-08-18 11:35:10 +08:00 |
|
|
Enric Gabriel
|
0aea0b2303
|
updat
|
2020-08-17 23:06:41 -03:00 |
|
|
SandPoot
|
66541bbe67
|
Adds tgstation's fix air for admins (#49)
|
2020-08-17 14:55:59 -03: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 |
|
|
Timothy Teakettle
|
f5300750b5
|
Revert "[TESTMERGE ONLY] FUCK"
|
2020-08-17 03:18:36 +01:00 |
|
|
silicons
|
4cd731ce11
|
Revert "cease your shitcode: cum edition"
|
2020-08-16 19:06:57 -07:00 |
|
|
silicons
|
b56742beb5
|
Merge branch 'pr-13110'
|
2020-08-16 18:40:23 -07:00 |
|
|
silicons
|
428bb936aa
|
Merge pull request #13037 from timothyteakettle/freedom-in-customisation
turns 304 lines of snowflake code into 24 lines
|
2020-08-16 18:35:05 -07:00 |
|
|
SandPoot
|
518c70e6ed
|
Some Cit reverts and skyrat features. (#46)
|
2020-08-15 13:29:50 -03:00 |
|