Commit Graph

134 Commits

Author SHA1 Message Date
Ghommie
29daa0c908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-04 22:59:24 +01:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie
ce0ba51b61 Fixing schlongs and death. 2019-10-25 12:52:32 +02:00
Ghommie
6bd0b85e54 I'd rather add a redundant get_held_index_of_item(I) than allow it to render privates over and over again. 2019-10-03 19:32:11 +02:00
Ghommie
59e6ed7014 inventory.dm is a mess too. 2019-10-03 19:09:47 +02:00
Ghommie
a65b4d0b1c hopefully a performance improvement to stop genitalia from having to update everytime. 2019-10-03 19:08:11 +02:00
Ghommie
7c77f2d2e3 testing... 2019-10-03 08:57:35 +02:00
Ghommie
6dbac16c74 Sanitizing the fermis code biohazard. 2019-10-03 04:31:11 +02:00
Ghommie
e66b95b9c9 More lines of code rewriting fermis' mess. 2019-09-01 05:58:57 +02:00
Ghommie
36ffd3d6a8 More lines. 2019-09-01 03:35:36 +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
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
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
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
Ghommie
44a28066a1 coding exasperation. 2019-07-25 04:44:34 +02:00
Ghommie
56f2a8f884 Fixes oversized tennis balls, testing and fixing. 2019-07-25 04:29:21 +02:00
Ghommie
30292c385b moving files. 2019-07-24 02:07:59 +02:00
Ghommie
6000f96dbc deleted some boolean variables in favor of bitflags. 2019-07-24 02:00:30 +02:00
Ghommie
376f6e8b4a arousal states won't persist after death anymore. 2019-07-23 23:54:11 +02:00
Ghommie
fd2f2ae1af update, bitflags. 2019-07-23 07:21:03 +02:00
Ghommie
3bd0ba0275 Cleaning up Arousal code & co. 2019-07-23 06:39:53 +02: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