Commit Graph

58 Commits

Author SHA1 Message Date
Putnam3145
6bb3d81d00 Better climax logging 2022-08-26 19:05:03 -07:00
Timothy Teakettle
b245a3d6b8 yes 2022-05-19 20:28:38 +01:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
BlueWildrose
3687361ba5 Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304)
* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2022-03-30 20:06:00 -07:00
bunny232
554c38fedf Update code/modules/arousal/arousal.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2022-03-23 05:28:24 -04:00
evan
8ddf825aa8 Update arousal.dm 2022-03-22 01:22:54 -04:00
DeltaFire
4aa0332e99 no. 2022-01-22 19:38:02 +01:00
silicons
f85d0dbda0 Merge pull request #15449 from Putnam3145/gib-podpeople
Allows pod people to be made using other fluids
2022-01-22 04:34:59 -08:00
Putnam3145
ef3e6923f8 Added more logging for climax-in-container 2022-01-11 17:39:50 -08:00
Putnam3145
c392b7c3fb Allows pod people to be made using other fluids 2021-12-31 14:36:55 -08:00
silicons
a32eabb7ae fix 2021-10-29 22:44:01 -07:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
1561138350 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-16 14:11:00 -03:00
SandPoot
608b6fbb1b Upload files 2021-10-12 22:17:43 -03:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
Putnam3145
370f7ea9f8 this can be null, so 2021-08-11 21:04:18 -07:00
Putnam3145
86e053afd2 Fixes circular reference in genits 2021-08-11 21:03:02 -07:00
Artur
cdbd585f4d update_appearance 2021-07-28 02:13:57 +03:00
Putnam3145
c253a2de86 alright how about these 2021-06-21 09:52:54 -07:00
Putnam
a9d73424d6 fixes a bad copypasta 2021-04-04 00:10:06 -07:00
Putnam
a26f850f1c don't push before thinking, kids 2021-02-20 07:41:37 -08:00
Putnam
d6350b2e75 undergarment logging too 2021-02-20 07:41:11 -08:00
Putnam
c24c339718 Fixed a runtime might cause issues.
This might also break logging completely, which, why. This isn't a high-priority log, though, so.
2021-02-20 07:36:46 -08:00
Putnam
990df7df37 added exposure logging 2021-02-18 21:36:54 -08:00
Putnam
c84dba85dd should also log climaxes (all of them) 2021-02-18 21:31:25 -08:00
Putnam
cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
silicons
68e9be9647 Merge pull request #14042 from kiwedespars/dildo-1
adds klonk sound effect for literal horsecock dildo
2021-01-15 04:00:08 -07:00
kiwedespars
ce1d73a6ac Update dildos.dm 2021-01-12 22:42:01 -08:00
BlueWildrose
19078449fe Merge branch 'master' into SkidoodleSkidaddle 2021-01-11 20:26:21 -07:00
Blue Wildrose
b4fbeddda9 Probably makes more sense 2021-01-11 00:12:13 -07:00
Blue Wildrose
4ec834c3dd your dick is no longer a big fat noodle 2021-01-11 00:00:48 -07:00
silicons
b3af424687 Update penis.dm 2021-01-05 02:46:30 -07:00
silicons
21bbbe6f2f Update breasts.dm 2021-01-05 02:46:00 -07:00
Blue Wildrose
642c4a5806 erect up the config instead in case this situation comes up again. 2021-01-02 00:18:49 -07:00
Blue Wildrose
843b1494b3 max penis size increased before being punished for having one 2021-01-01 23:01:39 -07:00
MrJWhit
258c6f3818 Update arousal.dm 2020-12-30 16:14:03 -05:00
qwerty
74c30dc3c1 better time length 2020-12-06 13:13:53 -06:00
qwerty
851f9afa20 bugfixes 2020-12-06 13:08:18 -06:00
qwerty
29141ba97d flash on climax 2020-12-06 12:36:30 -06:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
silicons
f66c60884d Merge pull request #13413 from Putnam3145/fix-fuid-too-fast
Properly standardizes fuid production rate.
2020-09-27 00:10:12 -07:00
Putnam
e3e2cc7682 Actually properly unkludged it. 2020-09-23 06:41:03 -07:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Putnam
666965c7b7 Made fuid generate 1/10 as fast. 2020-09-19 22:40:44 -07:00
Artur
b2fb23f4b9 Alt click fix 2020-09-08 17:56:05 +03:00
Putnam
b9bbdfdedf Fixes genital fuid production. 2020-09-07 01:23:31 -07:00
Timothy Teakettle
f5300750b5 Revert "[TESTMERGE ONLY] FUCK" 2020-08-17 03:18:36 +01:00
silicons
4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00