 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 |
|
|
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 |
|