b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
9dcb996901
additional
2023-11-04 01:11:52 -03:00
3bb6783438
content
2023-11-03 21:17:22 -03:00
d4ea14c4ef
push
2023-10-09 16:15:49 -03:00
b945e7a5ed
push
2023-10-07 20:48:02 -03:00
bcbecabf74
push
...
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com >
2023-10-06 01:11:28 -03:00
15d52e5b15
update content
2023-06-20 15:39:24 -03:00
0fe80e9234
Puts span defines on sandstorm's strings ( #284 )
2023-01-15 00:40:48 -03:00
74e9e4e38b
Lizard genitalia ( #263 )
...
* shit
* h
2022-09-27 22:46:50 -03:00
d9b51fa748
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-31 19:39:24 -03:00
6bb3d81d00
Better climax logging
2022-08-26 19:05:03 -07:00
89fa5c0bfe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-05-21 00:13:59 -03:00
b245a3d6b8
yes
2022-05-19 20:28:38 +01:00
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
282941ca5b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-03-31 00:21:11 -03:00
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
9c42027f65
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-03-25 11:54:12 -03:00
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
8ddf825aa8
Update arousal.dm
2022-03-22 01:22:54 -04:00
28cc02d653
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-22 17:18:15 -03:00
4aa0332e99
no.
2022-01-22 19:38:02 +01:00
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
283de98518
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-13 14:19:52 -03:00
ef3e6923f8
Added more logging for climax-in-container
2022-01-11 17:39:50 -08:00
c392b7c3fb
Allows pod people to be made using other fluids
2021-12-31 14:36:55 -08:00
b484927e55
Inverse milking moment ( #216 )
...
* smol micro runtime fix
:3
* blepppppp
lots of c
* Delete .NETFramework,Version=v4.0,Profile=Client.AssemblyAttributes.cs
* Delete UnstandardnessTestForDM.csproj.AssemblyReference.cache
2021-12-27 17:52:14 -03:00
c3068fc135
"Small" climax revamp ( #203 )
2021-12-07 10:57:35 -03:00
a127b0e553
Added genital picking for climax ( #200 )
...
* Added genital picking for climax
Yup
* Fixed
2021-11-30 19:26:10 -03:00
3da59fc38c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-05 14:27:17 -03:00
f753617a0b
Updates some lewd stuff ( #189 )
2021-11-03 13:59:02 -03:00
f1f6ac0109
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-31 22:14:23 -03:00
a32eabb7ae
fix
2021-10-29 22:44:01 -07:00
186b552103
merge
2021-10-29 21:50:58 -07:00
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
32a6e63698
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 23:11:54 -03:00
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
f94c76bea6
Adds fleshlights ( #187 )
...
* Upload files
* Update files
* Update objects.dm
nobody saw this shameful webedit.
2021-10-12 23:00:03 -03:00
608b6fbb1b
Upload files
2021-10-12 22:17:43 -03:00
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
6677dfa687
Adds tabs to the interaction menu ( #180 )
2021-09-06 16:33:35 -03:00
298a719a00
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-08-14 00:10:45 -03:00
370f7ea9f8
this can be null, so
2021-08-11 21:04:18 -07:00
86e053afd2
Fixes circular reference in genits
2021-08-11 21:03:02 -07:00
ab9b824ce9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-08-08 14:18:09 -03:00
cdbd585f4d
update_appearance
2021-07-28 02:13:57 +03:00
3b119c132d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-07-02 11:22:41 -03:00
c253a2de86
alright how about these
2021-06-21 09:52:54 -07:00
38bdb3cca3
Many underwear changes ( #156 )
...
* upload files
* upload files
2021-04-17 21:04:24 -03:00
SandPoot