Commit Graph

218 Commits

Author SHA1 Message Date
Linzolle
5ddd0484a8 colourable wings 2019-10-17 22:11:47 -05:00
r4d6
a61fed2a73 Update preferences.dm 2019-10-10 20:32:19 -04:00
JTGSZ
5b3f6dca29 Species Job Check 2019-09-23 23:58:57 -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
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
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
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
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
Poojawa
8988d1e506 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-11 02:41:36 -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
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
Thalpy
15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
kevinz000
08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114
Ports the toggleable dark mode to the game!
2019-07-20 11:57:13 -07:00
Thalpy
f77bcc9765 Merge branch 'master' into master 2019-07-14 15:10:32 +01:00
Ghommie
081c07098f randomizing colors. 2019-07-11 08:08:07 +02:00
Ghommie
143410c176 Blame Poojawa for the issue. 2019-07-11 07:39:29 +02:00
Ghommie
ba7c24a0ec Refactoring underwear to allow custom color preferences. 2019-07-09 23:25:54 +02:00
Ghommie
03315d1cbb Ports a toggleable darkmode to the game! 2019-07-05 22:29:50 +02:00
Poojawa
f66ee6f967 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-07-04 00:44:29 -05:00
Fermi
d83fe49556 +lewdchem pref on CC -EnthrallExpo from botany, tweaks messages on EExpo 2019-07-02 15:03:19 +01:00
kevinz000
7e1522b76b Merge pull request #8581 from Ghommie/Ghommie-cit42
[Ready]Reskinnable PDAs.
2019-06-28 20:30:05 -07:00
Poojawa
00a630abe5 Fixes errant ball behaviour 2019-06-26 07:42:02 -05:00
Ghommie
67f00fc049 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42 2019-06-24 16:48:15 +02:00
Poojawa
bf991cd2da Underwear overlays Gentials, can toggle each seperately (#8602)
* Gentials layered under underclothes

* screm
2019-06-17 11:20:25 -07:00
Poojawa
762a3e3c02 Ports revised job backend from TG 2019-06-16 18:45:26 -05:00
Ghommie
480ee9a9da Reskinnable PDAs. 2019-06-08 19:55:47 +02:00
Ghommie
0b53df47de Enough clowning around. 2019-06-07 03:22:26 +02:00
Poojawa
d4abb85641 Update preferences.dm 2019-06-02 09:40:18 -05:00
Poojawa
69b1373209 compile testing and tweaks 2019-06-02 08:06:16 -05:00
Poojawa
818ec19561 Working as intended, fixed a few other missing sprites
Started groundwork for multi-breasts and hidden balls.
2019-06-02 04:44:57 -05:00
Carlen White
bb2a8bdd59 Fixes flavor text from being removed when canceled.
This was because canceling really just sent a empty string and not null which caused it to set the flavor text to an empty string.
2019-05-22 00:38:18 -04:00
deathride58
06ea7de46b [S] Fixes a fairly huge vector for server crashes 2019-05-13 21:49:33 -04:00
Poojawa
be0829af53 cleans up loadout screen, fixes some suits, tweaks a few digi hand-holes 2019-05-01 00:10:27 -05:00