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 |
|
Ghommie
|
e74339ce8b
|
Jfc that's a lot of work!
|
2019-12-23 04:24:13 +01:00 |
|
nik707
|
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 |
|
Putnam3145
|
cfe35ce2fd
|
Merge pull request #10167 from Ghommie/Ghommie-cit458
Fixing some not safe for work oddity.
|
2019-12-17 11:52:41 -08:00 |
|
Ghommie
|
221291f525
|
Fixing some not safe for work oddity.
|
2019-12-13 08:02:39 +01:00 |
|
Lin
|
9ec8458803
|
Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
|
2019-12-10 23:52:31 +00:00 |
|
Hatterhat
|
d1bfe3d840
|
i hate
|
2019-12-06 21:43:15 -06:00 |
|
Ghommie
|
238655d599
|
Fixes eyes blindness a little.
|
2019-12-06 00:10:50 +01:00 |
|
Ghommie
|
3b8aebbbc2
|
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
|
2019-11-29 00:40:16 +01:00 |
|
kevinz000
|
6b53845f06
|
Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks
[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
|
2019-11-26 16:01:48 -07:00 |
|
BlackMajor
|
c81d1fe7a3
|
Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
|
2019-11-25 11:31:03 +13:00 |
|
Fermi
|
614a462176
|
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
This reverts commit 1509d9d183.
|
2019-11-24 03:33:02 +00:00 |
|
Fermi
|
ba4fa1ef67
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 03:06:08 +00:00 |
|
Fermi
|
aeb8606ce0
|
Revert "Revert "PLASE""
This reverts commit 00601a0c87.
|
2019-11-24 03:04:52 +00:00 |
|
Fermi
|
1df097b8ed
|
Revert "Revert "hark""
This reverts commit f4b54f15d2.
|
2019-11-24 03:04:31 +00:00 |
|
Fermi
|
f03b90f2e2
|
Revert "Revert "I can't spell""
This reverts commit 3d713b6c96.
|
2019-11-24 03:04:30 +00:00 |
|
Fermi
|
994c01c8ec
|
Revert "Revert "Trust your insincts""
This reverts commit 82c3e3cd9d.
|
2019-11-24 03:04:23 +00:00 |
|
Fermi
|
1509d9d183
|
Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit 135608551f, reversing
changes made to ce7e9ac452.
|
2019-11-24 03:04:13 +00:00 |
|
Fermi
|
c8b206a4cf
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 03:04:04 +00:00 |
|
Fermi
|
4c1c257035
|
Revert "Revert "pls""
This reverts commit b23f2a4460.
|
2019-11-24 03:02:21 +00:00 |
|
Fermi
|
9eaed4ea8e
|
Revert "pls2"
This reverts commit 0eb635b908.
|
2019-11-24 03:02:04 +00:00 |
|
Fermi
|
0eb635b908
|
pls2
ugh
|
2019-11-24 02:52:17 +00:00 |
|
Fermi
|
b23f2a4460
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 02:49:20 +00:00 |
|
Fermi
|
8c97511871
|
pls
ugh
|
2019-11-24 02:47:52 +00:00 |
|
Fermi
|
135608551f
|
Merge remote-tracking branch 'upstream/master'
|
2019-11-24 02:45:28 +00:00 |
|
Fermi
|
82c3e3cd9d
|
Revert "Trust your insincts"
This reverts commit 7a605b4ba6.
|
2019-11-24 02:44:52 +00:00 |
|
Fermi
|
3d713b6c96
|
Revert "I can't spell"
This reverts commit 0fed6d49e4.
|
2019-11-24 02:44:28 +00:00 |
|
Fermi
|
f4b54f15d2
|
Revert "hark"
This reverts commit 89bcb00ef1.
|
2019-11-24 02:44:19 +00:00 |
|
Fermi
|
00601a0c87
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 02:44:00 +00:00 |
|
Fermi
|
8af225e6e3
|
PLASE
|
2019-11-24 02:41:21 +00:00 |
|
Fermi
|
89bcb00ef1
|
hark
|
2019-11-23 00:54:40 +00:00 |
|
Fermi
|
0fed6d49e4
|
I can't spell
|
2019-11-23 00:32:33 +00:00 |
|
Fermi
|
7a605b4ba6
|
Trust your insincts
|
2019-11-23 00:16:34 +00:00 |
|