Commit Graph

411 Commits

Author SHA1 Message Date
silicons
f6bbfc2c88 Merge pull request #13513 from timothyteakettle/eye-sprites
adds selectable eye types to customization
2020-10-06 16:51:44 -07:00
Timothy Teakettle
46ebb72905 Merge branch 'master' into loadout-loading 2020-10-04 01:43:17 +01:00
Timothy Teakettle
b48f4b91e6 Merge branch 'master' into eye-sprites 2020-10-04 01:23:03 +01:00
Timothy Teakettle
0c99b53c05 eyes 2020-10-03 23:22:53 +01:00
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
Putnam
c644495e5e dodgin bullets 2020-09-29 21:07:41 -07:00
timothyteakettle
396872e98e show the right thing 2020-09-28 23:21:34 +01:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
Timothy Teakettle
e67fbed1ba always regenerate icons 2020-09-15 18:37:14 +01:00
Timothy Teakettle
8f6c353ad0 memory leak bad 2020-09-05 21:35:02 +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
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
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
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
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
Timothy Teakettle
a7a6489f58 loadout loading 2020-08-23 21:48:38 +01:00
silicons
2fa023346a Merge pull request #13204 from timothyteakettle/donator-items
adds three t1 donator items
2020-08-23 05:08:50 -07: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
264e789c3d yes 2020-08-18 17:38:20 +01:00
Timothy Teakettle
6392367df4 donator items 2020-08-18 17:28:09 +01: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
timothyteakettle
1f240b883f holy shit 2020-08-11 03:37:04 +01:00
Putnam
02c990ab27 Toggle's no longer relevant. 2020-08-08 02:18:58 -07:00
silicons
aa5b99a9d4 make it end 2020-08-07 00:03:59 -07:00
silicons
4dd51f3d9c fix 2020-08-06 23:48:05 -07:00
silicons
72d0f2a4a3 AAAAAAAA 2020-08-06 23:43:14 -07:00
silicons
65839060c9 Fixes 2020-08-06 23:39:57 -07:00
silicons
3640a33ff6 e 2020-08-06 23:22:53 -07:00
silicons
bcfc601c7a sigh 2020-08-06 23:11:09 -07:00
silicons
8edb374a20 sigh 2020-08-06 23:09:02 -07:00
silicons
1586625e6b Merge pull request #12960 from timothyteakettle/loadout-you-say
loadout changes part 1: adds subcategories to the loadout
2020-08-06 21:59:13 -07:00
silicons
f5f0d6be81 Merge pull request #12990 from timothyteakettle/tongue-patch
make tongue preference pass through cloning
2020-08-05 15:26:04 -07:00
Timothy Teakettle
6ba359e0a1 fix 2020-08-05 17:43:54 +01:00