Putnam
|
7626750c49
|
hypno tweaks
|
2020-01-28 23:03:29 -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
|
cd35e516ac
|
back by popular demand: maso/nympho
|
2020-01-07 17:01:14 -08:00 |
|
Putnam
|
d75a525b3c
|
let's fix arousal huh
|
2020-01-05 19:10:48 -08:00 |
|
Ghommie
|
49f1176170
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-30 16:06:16 +01:00 |
|
Ghommie
|
e74339ce8b
|
Jfc that's a lot of work!
|
2019-12-23 04:24:13 +01:00 |
|
Putnam
|
c810145fc1
|
also adds aphrodisiacs, slaps, all hypno as prefs
|
2019-12-20 14:47:09 -08:00 |
|
Putnam
|
f2b46f0951
|
ROBUST OPTING MECHANICS
|
2019-12-19 11:14:02 -08:00 |
|
Putnam
|
9ec2c8a7f1
|
MKUltra made double opt-in
|
2019-12-19 09:54:34 -08:00 |
|
GrayRachnid
|
de43339d56
|
made it actually compile
|
2019-11-27 16:42:28 -05:00 |
|
GrayRachnid
|
47e3cd346f
|
Fixes codewords and MKUltra enthrall hearing.
|
2019-11-27 16:36:19 -05: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
|
25fe5ec14b
|
Revert "Revert "Alright""
This reverts commit 505e15a3e1.
|
2019-11-24 03:04:37 +00:00 |
|
Fermi
|
6729a62200
|
Revert "Revert "Well""
This reverts commit df5814c30e.
|
2019-11-24 03:04:25 +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
|
df5814c30e
|
Revert "Well"
This reverts commit e44c8c0a4a.
|
2019-11-24 02:44:36 +00:00 |
|
Fermi
|
505e15a3e1
|
Revert "Alright"
This reverts commit b756f37ff6.
|
2019-11-24 02:44:10 +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
|
b756f37ff6
|
Alright
|
2019-11-23 01:05:42 +00:00 |
|
Fermi
|
e44c8c0a4a
|
Well
I guess
|
2019-11-23 00:18:45 +00:00 |
|
Fermi
|
b404e18b15
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-11-23 00:10:33 +00:00 |
|
kevinz000
|
d9c38d0589
|
Merge pull request #8948 from Ghommie/Ghommie-cit156
Cleaning up the arousal module.
|
2019-10-31 17:27:03 -07:00 |
|
Ghommie
|
79c3700d25
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-25 12:42:28 +02:00 |
|
Ghommie
|
cb74be29ae
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262
|
2019-10-25 12:40:50 +02:00 |
|
Ghommie
|
20d9adaccd
|
Floaty floating.
|
2019-10-23 20:43:05 +02:00 |
|
Ghommie
|
a95b13c24a
|
jetpack fixes too & co
|
2019-10-23 19:31:54 +02:00 |
|
Ghommie
|
ba307b01a5
|
Defib fixes and chem effects stuff
|
2019-10-23 13:45:57 +02:00 |
|
Ghommie
|
475303bd02
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-17 00:50:30 +02:00 |
|
Thalpy
|
9bb045b60a
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-10-08 13:10:35 +01:00 |
|
Ghommie
|
6dbac16c74
|
Sanitizing the fermis code biohazard.
|
2019-10-03 04:31:11 +02:00 |
|
Thalpy
|
bfee1c13ff
|
Bhijin's requests.
|
2019-10-01 20:58:31 +01:00 |
|
Fermi
|
f5c5e81e67
|
I thought I removed this in the original PR!
|
2019-09-27 14:16:36 +01:00 |
|
Fermi
|
107dd67cbe
|
Well it compiles; just synthtissue and TongueLoss now.
|
2019-09-19 01:14:12 +01:00 |
|
Fermi
|
c23d6f0113
|
I missed an earlier port.
|
2019-09-17 01:08:37 +01:00 |
|
Fermi
|
b22994e546
|
Removes MK stuffs
|
2019-09-10 21:59:24 +01:00 |
|
Fermi
|
443f9e433d
|
Final tweaks
|
2019-09-10 20:18:45 +01:00 |
|
Fermi
|
018ebc32ae
|
All that remains is MK testing.
|
2019-09-08 02:46:43 +01:00 |
|
Fermi
|
d90b4769f1
|
MK, SDGF, Astrogen, Eigen, BE, furranium, hattmium tweaks and fixes.
|
2019-09-05 22:30:53 +01:00 |
|
Fermi
|
a605d2a776
|
Todo: finish new words and review langauge
|
2019-09-03 20:16:41 +01:00 |
|
Fermi
|
a5fcb918aa
|
Astrogen tweaks and cat fixes.
|
2019-07-19 04:11:26 +01:00 |
|
Fermi
|
3512d5eaec
|
MK only pacifies on withdrawal now.
|
2019-07-16 06:00:40 +01:00 |
|
Fermi
|
d8a46dd0e3
|
Another fix to reduce spam.
|
2019-07-15 23:10:16 +01:00 |
|
Fermi
|
c746cb3078
|
Quick fix
|
2019-07-15 23:07:49 +01:00 |
|