Commit Graph

510 Commits

Author SHA1 Message Date
r4d6
a61fed2a73 Update preferences.dm 2019-10-10 20:32:19 -04:00
r4d6
ce81e657b5 Update preferences_savefile.dm 2019-10-10 20:32:17 -04:00
kevinz000
f405cd1be3 Merge pull request #8937 from Ghommie/Ghommie-cit153
darkmode/lightmode fixes and tweaks.
2019-10-08 00:25:51 -07:00
JTGSZ
5b3f6dca29 Species Job Check 2019-09-23 23:58:57 -04:00
kevinz000
1fda7755d3 Merge pull request #9298 from Ghommie/Ghommie-cit197
Fixes undershirts n socks colors prefs.
2019-09-21 01:43:10 -07:00
kevinz000
2cf1e6ff85 Merge pull request #9302 from deathride58/jobcodesanitychecks
fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks
2019-09-17 22:00:59 -07:00
Ghommie
8bf4d5754e I'm a moron. 2019-09-18 04:23:52 +02:00
deathride58
18e97451a3 Merge branch 'master' into jobcodesanitychecks 2019-09-17 22:15:09 -04:00
deathride58
d0296a5e81 fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks 2019-09-17 20:15:06 -04:00
Ghommie
150da1d34a code quality 2019-09-18 01:37:17 +02:00
Ghommie
63fbf225a6 aaaaa 2019-09-18 01:24:44 +02:00
Ghommie
040b6472b4 FUCK 2019-09-18 01:21:18 +02:00
Ghommie
3ba5a2fd69 Fixes undershirts n socks colors. 2019-09-17 18:34:16 +02:00
Poojawa
6668630649 Merge branch 'master' into are-those-horns-are-are-you-just-retarded 2019-09-15 23:25:22 -05:00
Poojawa
bf3d30c0e4 Seperates Insect fluff from wings
Fluff can be the new body markings I guess.
2019-09-14 04:27:38 -05:00
Poojawa
f0afc9c490 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-13 12:59:15 -05:00
Poojawa
9376bfb44d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded 2019-09-13 12:56:57 -05:00
kevinz000
eab0b8934f Merge pull request #9279 from Ghommie/Ghommie-cit192
Fixing undergarments color preferences resetting each round.
2019-09-13 10:43:43 -07:00
Poojawa
9561819fb7 Fixes Horn coloration issues, allows mammals to choose their meat type
Because reasons I guess.
2019-09-13 10:58:04 -05:00
Poojawa
8946d6d059 Update preferences_savefile.dm 2019-09-12 19:02:06 -05:00
Poojawa
4289f4c419 Better way of doing the conversions I think 2019-09-12 19:01:39 -05:00
Ghommie
c090c98118 final fixes. 2019-09-12 04:11:44 +02:00
Ghommie
025b6122d4 short colors 2019-09-12 02:58:34 +02:00
Ghommie
e0a29ec001 Fixing undergarments color resetting each round. 2019-09-12 02:48:26 +02:00
deathride58
4551b13547 [s] ports tgstation/tgstation#46425 2019-09-11 19:24:05 -04:00
Poojawa
6dfb22ea47 Update preferences_savefile.dm 2019-09-11 17:58:32 -05:00
Poojawa
94afbbd560 Adding Horn colors, multiple-select legs, and species squash
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking.  Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
Ghommie
cbf041663f Fixing and testing themes. 2019-09-11 23:30:04 +02:00
Poojawa
8988d1e506 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-11 02:41:36 -05:00
nik707
dd7907c3d7 Merge pull request #9057 from EgoSumStultus/male-AI-vox
Adds the Male AI vox voice.
2019-09-02 18:27:03 -05:00
Poojawa
5d33321f80 Merge remote-tracking branch 'refs/remotes/origin/job-pref-jonks' into job-menu-improvements 2019-08-18 07:46:00 -05:00
Poojawa
867b112158 HOW DID THIS NOT GET UPDATED???? 2019-08-18 07:44:46 -05:00
kevinz000
fb2971e3e6 Merge remote-tracking branch 'origin/master' into donator_grouping 2019-08-15 14:40:44 -07:00
Poojawa
b671384015 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-15 08:23:48 -05:00
deathride58
2406254faa Merge pull request #9100 from cebutris/got-milk
Breasts no longer lactate by default, Lactation is now a preference
2019-08-14 15:40:53 -04:00
Poojawa
2b2bdb37ba Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-10 23:26:20 -05:00
BlackMajor
5dcd419d8a Merge pull request #8356 from Thalpy/master
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
2019-08-11 16:09:23 +12:00
Cebutris
df136ab96c lactation is now a preference 2019-08-10 23:28:16 -04:00
Poojawa
d496e16dde Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-10 19:14:41 -05:00
Ghommie
ee57720ee3 underwear colors fix 2: The revenge of the crunch. 2019-08-09 05:11:12 +02:00
kevinz000
65473dc4ba s 2019-08-07 13:18:45 -07:00
EgoSumStultus
55b39a9cc6 male AI vox 2019-08-05 05:01:43 -07:00
Thalpy
5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
Poojawa
218cbe2dbc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-07-31 19:09:35 -05:00
Ghommie
397c62bf7a undergarment fixes. 2019-07-31 16:19:25 +02:00
Fermi
d080446a77 Merge branch 'pr/20' 2019-07-28 23:28:19 +01:00
Poojawa
8c63ea7b6d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-07-26 17:36:46 -05:00
Sishen
1a92134ad3 b 2019-07-25 21:43:02 -04:00
Ghommie
aa40f56306 darkmode/lightmode fixes and tweaks. 2019-07-21 07:49:52 +02:00
Thalpy
15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00