Commit Graph

115 Commits

Author SHA1 Message Date
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
Cebutris
df136ab96c lactation is now a preference 2019-08-10 23:28:16 -04:00
Fermi
eb9e6a041d Ghommie's fix. 2019-08-09 12:17:54 +01:00
Thalpy
53e9c140cf Merge pull request #22 from Citadel-Station-13/master
YARR
2019-08-06 16:08:16 +01:00
CameronWoof
6f02c5c6f6 don't pre-fill the tank 2019-08-04 01:10:17 -07:00
CameronWoof
900d8d00af Officially ends the non-stop thrill ride of coating the station in your various fluids for "fun" 2019-08-03 20:37:02 -07:00
Thalpy
937d6467e6 Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_ 2019-06-30 19:16:27 +01:00
Thalpy
696d879874 Merge branch 'master' into master 2019-06-29 15:48:25 +01:00
Thalpy
44337c6a08 Forgot to update lists when removing all sizes from GLOB. 2019-06-29 03:16:54 +01:00
Poojawa
00a630abe5 Fixes errant ball behaviour 2019-06-26 07:42:02 -05:00
Fermi
1ad92b9758 Final round of fixes from testing. 2019-06-25 23:44:04 +01:00
Fermi
3928e027b4 Fixes (see dev discussion) 2019-06-25 23:06:55 +01:00
Fermi
713d849c03 Merge remote-tracking branch 'upstream/master' 2019-06-19 21:02:30 +01:00
Poojawa
bf991cd2da Underwear overlays Gentials, can toggle each seperately (#8602)
* Gentials layered under underclothes

* screm
2019-06-17 11:20:25 -07:00
Thalpy
41eee65b15 Merge branch 'master' into master 2019-06-17 12:18:40 +01:00
Fermi
7a66039f0c Fixing merge errors.
Testmerge ready.
2019-06-14 21:55:17 +01:00
Fermi
6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
Fermi
14aa7084a8 Breast rename. 2019-06-13 04:37:03 +01:00
Fermi
097c338ded PE replaced with... You know what. 2019-06-13 04:32:52 +01:00
Poojawa
80659a540b Update modular_citadel/code/modules/arousal/organs/testicles.dm
I guess

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-06-09 09:59:31 -05:00
Poojawa
6bdf5f585a fixes testicle runtimes 2019-06-09 00:49:40 -05:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Fermi
228ab5b7c9 +Acute hepatic pharmacokinesis. (untested, will test with alterations)CC 2019-06-05 00:23:42 +01:00
Fermi
255aa60441 Final pooj changes. 2019-06-02 22:57:50 +01:00
Fermi
0eec1ed3f3 Pooj changes. 2019-06-02 22:49:04 +01:00
Poojawa
25458fad63 I refuse to eat crow. 2019-06-02 08:40:51 -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
Thalpy
90949f406d Fixed the forceMove issue. 2019-05-29 20:17:22 +01:00
Fermi
d4d955b138 Finished. 2019-05-29 03:29:17 +01:00
Fermi
01a38479fa Why did I fiddle with things I shouldn't have. 2019-05-29 03:16:11 +01:00
Fermi
91cfd8e052 Before say component remove. 2019-05-29 03:01:47 +01:00
Fermi
336ba8dbad Tidying code. 2019-05-29 02:33:15 +01:00
Fermi
543dc9a399 Final fixes, finally fixed all problems. 2019-05-29 01:33:07 +01:00
Fermi
12eb5e9b17 ARGH 2019-05-28 23:35:50 +01:00
Fermi
89665de8a7 Last round of test checks. 2019-05-28 22:33:04 +01:00
Fermi
48ae55d61d Sishen implementation 2019-05-28 19:25:31 +01:00
Fermi
8282819c84 CHECK PLASMA THOUGH! 2019-05-28 05:03:58 +01:00
Fermi
df2a14880e Beginning comment purge. 2019-05-28 00:35:33 +01:00
Fermi
79a7b6b45b Fixes. 2019-05-27 20:25:57 +01:00
Fermi
4607a2b6c3 Compile safe. Today's fixes. 2019-05-27 05:39:52 +01:00
Poojawa
2aa86157e1 Fixes rendering issues. Adds balls to be rendered 2019-05-26 04:52:31 -05:00
Fermi
bd85095590 Prebed tweaks 2019-05-26 05:34:28 +01:00
Fermi
91f10442cf Merge branch 'pr/12' 2019-05-26 02:05:48 +01:00
Fermi
87deaf07c5 Update breasts.dm
I do not like how git works sometimes.
2019-05-26 01:55:59 +01:00
Fermi
a0073295e1 Updating from Cit, pre PR. 2019-05-26 01:49:58 +01:00
kevinz000
e434b9ceb5 Merge pull request #8397 from WhiteHusky/arousal-related-styling-fixes
Changed arousal message styling.
2019-05-25 11:30:18 -07:00
Fermi
e3d3f30ea9 Could this be the final commit?! 2019-05-25 16:12:46 +01:00
Fermi
e2c1eb1d7c prebed fixes 2019-05-25 05:27:28 +01:00
Fermi
b4624c5537 I really hate genitals. 2019-05-25 03:15:15 +01:00