Commit Graph
131 Commits
Author SHA1 Message Date
Ghommie 0eb5aa0a2a Removing a couple troublesome NSFW unused prefs. 2020-02-04 04:58:09 +01:00
Putnam e9c3eb9eb4 . 2020-01-30 04:24:18 -08:00
Putnam 48fadffbfb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-10 17:57:03 -08:00
Putnam 32043a9062 whoops forgot permaboner 2020-01-06 01:14:00 -08:00
Putnam d75a525b3c let's fix arousal huh 2020-01-05 19:10:48 -08:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
nik707andGitHub dd62a9ca87 Merge pull request #10084 from Hatterhat/i-dont-test-my-code
i dont make good code
2019-12-19 14:10:18 -06:00
Ghommie 221291f525 Fixing some not safe for work oddity. 2019-12-13 08:02:39 +01:00
Hatterhat d1bfe3d840 i hate 2019-12-06 21:43:15 -06:00
FermiandFermi ba4fa1ef67 Revert "PLASE"
This reverts commit 8af225e6e3.
2019-11-24 03:06:08 +00:00
FermiandFermi aeb8606ce0 Revert "Revert "PLASE""
This reverts commit 00601a0c87.
2019-11-24 03:04:52 +00:00
FermiandFermi 994c01c8ec Revert "Revert "Trust your insincts""
This reverts commit 82c3e3cd9d.
2019-11-24 03:04:23 +00:00
FermiandFermi c8b206a4cf Revert "pls"
This reverts commit 8c97511871.
2019-11-24 03:04:04 +00:00
FermiandFermi 4c1c257035 Revert "Revert "pls""
This reverts commit b23f2a4460.
2019-11-24 03:02:21 +00:00
FermiandFermi 9eaed4ea8e Revert "pls2"
This reverts commit 0eb635b908.
2019-11-24 03:02:04 +00:00
FermiandFermi 0eb635b908 pls2
ugh
2019-11-24 02:52:17 +00:00
FermiandFermi b23f2a4460 Revert "pls"
This reverts commit 8c97511871.
2019-11-24 02:49:20 +00:00
FermiandFermi 8c97511871 pls
ugh
2019-11-24 02:47:52 +00:00
FermiandFermi 82c3e3cd9d Revert "Trust your insincts"
This reverts commit 7a605b4ba6.
2019-11-24 02:44:52 +00:00
FermiandFermi 00601a0c87 Revert "PLASE"
This reverts commit 8af225e6e3.
2019-11-24 02:44:00 +00:00
FermiandFermi 8af225e6e3 PLASE 2019-11-24 02:41:21 +00:00
FermiandFermi 7a605b4ba6 Trust your insincts 2019-11-23 00:16:34 +00:00
FermiandFermi b404e18b15 Merge branch 'master' into FERMICHEMCurTweaks 2019-11-23 00:10:33 +00:00
Ghommie ce0ba51b61 Fixing schlongs and death. 2019-10-25 12:52:32 +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
FermiandFermi 018ebc32ae All that remains is MK testing. 2019-09-08 02:46:43 +01:00
FermiandFermi d90b4769f1 MK, SDGF, Astrogen, Eigen, BE, furranium, hattmium tweaks and fixes. 2019-09-05 22:30:53 +01:00
FermiandFermi 7890ad08d5 what is this 2019-09-03 20:30:21 +01:00
Ghommie e66b95b9c9 More lines of code rewriting fermis' mess. 2019-09-01 05:58:57 +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
deathride58andGitHub 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
ThalpyandGitHub 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 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
ThalpyandGitHub 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