Commit Graph

536 Commits

Author SHA1 Message Date
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
Ghommie db3c36fd9a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-09-01 01:59:00 +02:00
Ghommie 2a7b802957 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-08-29 21:01:23 +02: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 efe72ce973 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-08-09 06:47:27 +02: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 3bd0ba0275 Cleaning up Arousal code & co. 2019-07-23 06:39:53 +02: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
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
kevinz000 b153294a24 Merge pull request #8857 from Ghommie/Ghoomie-cit127
Refactoring underwear to allow custom color preferences.
2019-07-14 03:38:45 -07:00
Ghommie d36bae06a7 Ports the Chem Master choose your pill PR plus post-improvements 2019-07-12 07:39:17 +02: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 29dcfa1160 bluepilled. 2019-07-06 03:56:06 +02:00
Ghommie d14b18f89a I hate byond dmf editor what the $&@* 2019-07-06 03:17:20 +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
Thalpy 8a6e669060 Merge branch 'master' into master 2019-07-04 03:14:29 +01:00
Fermi d83fe49556 +lewdchem pref on CC -EnthrallExpo from botany, tweaks messages on EExpo 2019-07-02 15:03:19 +01:00
Ghommie c569da5713 Fixes PDA skin preference not saving up. 2019-06-30 17:17:23 +02:00
kevinz000 7e1522b76b Merge pull request #8581 from Ghommie/Ghommie-cit42
[Ready]Reskinnable PDAs.
2019-06-28 20:30:05 -07:00
deathride58 fb66d382fa Merge pull request #8727 from Ghommie/Ghommie-cit78
Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcades.
2019-06-28 00:47:09 -04:00
Poojawa 00a630abe5 Fixes errant ball behaviour 2019-06-26 07:42:02 -05:00
Ghommie 61a6d899d2 Should be ready. 2019-06-26 00:21:06 +02: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
Ghommie 138535f9f6 Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcade machines. 2019-06-22 23:15:51 +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 52d217a92b deathride man good. 2019-06-08 21:48:39 +02:00
Ghommie 480ee9a9da Reskinnable PDAs. 2019-06-08 19:55:47 +02:00