Commit Graph

223 Commits

Author SHA1 Message Date
Ghommie
58bc10bd31 Fixing three runtime errors. 2020-04-02 23:33:40 +02:00
Ghommie
e26b43d80b The banishment of the floating disembodied phallus. 2020-03-31 02:40:28 +02:00
Ghommie
ddf4d759bd Now locally tested too and it works fine. 2020-03-25 17:25:23 +01:00
Ghommie
c05d2c1572 Making it actually work. 2020-03-25 17:08:09 +01:00
Ghommie
c6b4b5f686 lazy fix before I go to sleep. 2020-03-25 05:17:09 +01:00
Ghommie
c1e13a83fb Boom. 2020-03-25 03:35:29 +01:00
Ghommie
c9f02d97a1 Privates Visibility Preferences. Also Undergarments having a purpose. 2020-03-25 02:47:16 +01:00
Ghommie
6c6b2a42eb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit629 2020-03-21 15:04:35 +01:00
Ghommie
7c22b341b9 Undefined var. 2020-03-19 17:38:41 +01:00
Ghommie
eca7eb2bcd Nothing 2020-03-19 17:35:18 +01:00
Ghommie
eeab3ed11f Everyday 2020-03-19 17:34:01 +01:00
Ghommie
dd7046cbd1 no comment 2020-03-19 16:53:58 +01:00
Ghom
038f37d309 Something about layers. 2020-03-08 05:10:03 +01:00
Detective-Google
1f88a22d04 Merge branch 'master' into big-chode-energy 2020-02-27 16:39:57 -06:00
Detective Google
b7aad30d3c girth -> diameter 2020-02-27 16:38:14 -06:00
kevinz000
b9e8be5784 Merge pull request #10940 from Ghommie/Ghommie-cit560
First tweak to cargo reagents selling.
2020-02-15 12:15:50 -07:00
Ghommie
4a621fb1aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560 2020-02-14 19:39:53 +01:00
Ghommie
a0dc21b01c ok. 2020-02-13 12:50:08 +01:00
Ghommie
b8cebf8953 Fixing some privates overlays 2020-02-13 12:41:36 +01:00
Ghom
1fd8ebc2dc Update genitals.dm 2020-02-13 08:28:52 +01:00
Ghom
e4a20a16a4 Update genitals.dm 2020-02-13 08:25:44 +01:00
Ghom
1ef3f45f89 Update genitals.dm 2020-02-13 08:22:08 +01:00
Ghom
d9885cf278 oh damn, forgot those are numbers 2020-02-13 08:16:37 +01:00
Ghom
ee10c03630 Merge branch 'master' into Ghommie-cit562 2020-02-13 08:00:53 +01:00
Ghommie
c68c96373c Ok. 2020-02-09 07:07:47 +01:00
Ghommie
f6adce72fb Something about missing private sprites and their bad code. 2020-02-09 06:51:57 +01:00
Ghom
2370de52f9 Update genitals.dm 2020-02-07 02:46:15 +01:00
Ghommie
7f431af99d Ok 2020-02-07 01:33:47 +01:00
Ghommie
00042292cf Byond is pretty special. 2020-02-07 01:14:19 +01:00
Ghommie
39d6980bab genitals code is so bad. 2020-02-07 01:03:59 +01:00
Ghommie
28df05bbb0 step 1 2020-02-07 00:24:54 +01:00
Ghommie
0703c6eea6 First tweak to cargo reagents selling. 2020-02-06 22:34:54 +01:00
kevinz000
cda01e10f6 Merge pull request #10885 from Ghommie/Ghommie-cit553
Removing a couple troublesome NSFW useless and unused preferences.
2020-02-05 23:45:30 -07:00
Ghom
4b1e3d216f Merge pull request #10583 from Putnam3145/arousal-tweaks
Consent logging
2020-02-05 07:19:37 +01:00
kevinz000
275b1f73e0 Merge pull request #10849 from Ghommie/Ghommie-cit547
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-04 03:39:14 -07:00
Ghommie
0eb5aa0a2a Removing a couple troublesome NSFW unused prefs. 2020-02-04 04:58:09 +01:00
Ghom
f8a2116d7d Merge pull request #10866 from ancientpower/skintone-match-fix
Fixes genital skintone mismatching
2020-02-03 08:57:39 +01:00
ancientpower
b55b375d17 fixes a bug with skintone in character creation 2020-02-02 22:59:36 -06:00
Ghommie
8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable 2020-02-02 03:39:49 +01:00
Putnam
e9c3eb9eb4 . 2020-01-30 04:24:18 -08:00
Putnam
ae4afdd904 made it work (wow!) 2020-01-17 03:09:46 -08:00
Putnam
c735123e4e consent logging and arousal tweaks 2020-01-17 02:47:16 -08:00
Putnam
fa0080d8d6 made climax with partner require EXPLICIT consent 2020-01-15 20:55:39 -08:00
Putnam
a1922a459e Moved Arousal tab stuff to IC tab 2020-01-15 20:14:23 -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
c9fa4bc4eb whoops that wasn't working 2020-01-07 17:37:03 -08:00
Putnam
8fd7a3db8b added back climax with partner 2020-01-07 17:27:34 -08:00
Putnam
cd35e516ac back by popular demand: maso/nympho 2020-01-07 17:01:14 -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