Commit Graph

900 Commits

Author SHA1 Message Date
silicons
6094cd7191 Merge pull request #13508 from DeltaFire15/robotic-fixes
bodypart fixes - robotic bodypart & digitigrade edition
2020-10-03 14:32:45 -07:00
DeltaFire
79af981467 fixes some fun limb code 2020-10-03 21:51:49 +02:00
Timothy Teakettle
e1123ad7fe color define 2020-10-01 18:55:32 +01:00
silicons
fba8bfbf4f Merge pull request #13467 from Putnam3145/past-me-idiot
Fixes vore prefs (I was looking in the wrong place the whole time)
2020-10-01 03:10:04 -07:00
silicons
bb09acff4c Merge pull request #13463 from timothyteakettle/slime-sprites
adds luminescent and stargazer sprites as selectable body sprites for slimes
2020-10-01 03:06:41 -07:00
silicons
46a80af956 Merge pull request #13317 from LetterN/what-if-the-savefile-itself-is-teakproof-questionmark_charachter
Ports tgstation/tgstation#52549
2020-10-01 02:56:39 -07:00
Putnam
c644495e5e dodgin bullets 2020-09-29 21:07:41 -07:00
Putnam
0c7003b3a5 never code while tired 2020-09-29 20:37:48 -07:00
Putnam
f8200a5838 Shitcode fixing inop code. 2020-09-29 06:40:09 -07:00
timothyteakettle
396872e98e show the right thing 2020-09-28 23:21:34 +01:00
Timothy Teakettle
783c33067b typo moment 2020-09-28 22:13:33 +01:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
Putnam3145
c41add450a Merge pull request #13425 from Arturlang/TGUI_Updoot
Fixes some statpanel Issues
2020-09-23 14:19:22 -07:00
Artur
e483cf06b3 fIXD 2020-09-23 19:54:30 +03:00
silicons
90aa47f339 Merge pull request #13329 from Arturlang/TGUI_Updoot
TGUI updates + statpanel
2020-09-21 03:11:06 -07:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Timothy Teakettle
e67fbed1ba always regenerate icons 2020-09-15 18:37:14 +01: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
798e11c407 logic 2020-09-03 22:36:38 +01:00
timothyteakettle
9e2ee588c9 rp prosthetics 2020-09-03 22:05:21 +01:00
Artur
8d073bbce6 Merge remote-tracking branch 'upstream/master' into TGUI_Updoot 2020-09-02 19:05:18 +03:00
Artur
3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
timothyteakettle
594fd17f23 test 2020-09-02 15:34:13 +01: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
Letter N
ceea4f07ea tested? no 2020-08-31 10:43:03 +08: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
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
Timothy Teakettle
b76cf0004b ui adjustment 2020-08-28 18:34:00 +01:00
Timothy Teakettle
1d943a34ef heterochromia 2020-08-28 18:30:28 +01:00
Putnam
c7883775fa Added a pref to see genitals on examine. 2020-08-27 20:22:24 -07: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
Timothy Teakettle
d877a8c0fb qol (#13250) 2020-08-26 14:14:19 +02:00
timothyteakettle
cd7293a9a2 limbs 2020-08-24 03:19:36 +01: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
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