BongaTheProto
2d1d665e41
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit c1c9fef2246767f48e82
2023-12-16 10:48:35 -05:00
BongaTheProto
5afdd65bdb
Revert "followup"
...
This reverts commit 32b361c846
2023-12-16 10:48:30 -05:00
BongaTheProto
32b361c846
followup
2023-12-15 18:38:06 -05:00
BongaTheProto
c1c9fef224
Merge remote-tracking branch 'upstream/master'
2023-12-15 18:12:47 -05:00
SandPoot
bfc964b76b
do you know the definition of insanity
2023-12-09 20:27:19 -03:00
WoolyAypa
078413e553
Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system
2023-02-11 22:37:34 -03:00
WoolyAypa
4cd6975b3b
conflictos
2023-01-18 21:27:19 -03:00
BongaTheProto
d8141d260e
Merge branch 'master' into pr/600
2023-01-16 02:31:47 -05:00
BongaTheProto
596ab81dd0
Merge remote-tracking branch 'upstream/master'
2023-01-16 01:06:20 -05:00
SandPoot and GitHub
0fe80e9234
Puts span defines on sandstorm's strings ( #284 )
2023-01-15 00:40:48 -03:00
JimmyDrop
80729c8553
Initial Clothing Pass
...
Initial pass of edible Clothing. Should cover most cases with some outliers still existing. In general most important things are protected, such as hard suits, armor, helmets, gasmask, CRBN equipment, and glasses.
Ill give this another pass later to get most of outliers. But for now this should be fine.
2022-12-20 14:51:48 -05:00
WoolyAypa
b1c288d267
help!
2022-12-12 12:38:18 -03:00
LamkasDev
436be7d869
feat: add strapon fleshlight compability
2022-10-10 22:43:36 +02:00
LamkasDev
0759fc04f2
fix: remove strapon checks for portal panties
2022-09-13 18:30:12 +02:00
LamkasDev
fba9cd66de
feat: add strapons
2022-09-05 16:34:26 +02:00
Anonymous
7861c5d458
I never asked for this
2022-05-16 23:54:09 +03:00
Jerry Wester
9eba0c6ac8
no more multiple fleshlights linked to underwear
2022-05-12 00:38:25 -06:00
Jerry Wester
359fb50851
fix grammar
2022-05-10 01:48:55 -06:00
Jerry Wester
27b1099590
mossy can be thanked for this commit
2022-05-09 22:37:35 -06:00
Jerry Wester
08f4f0173f
remove item interactions, bug fixes, finalization
2022-05-07 21:28:19 -06:00
Jerry Wester
6a92e472bb
add sprites (thank you @Moltov#6925), etc.
2022-05-06 22:30:41 -06:00
Jerry Wester
fc9f4da591
portal-ception
2022-05-06 12:56:53 -06:00
Jerry Wester
cd2c6975c3
fix "mouth" color
2022-05-06 10:31:08 -06:00
Jerry Wester
46ac78099d
add mouth target, organize shit
2022-05-06 10:18:08 -06:00
Jerry Wester
c1a70740a0
no more butts, only anuses. anuses? ani?
2022-05-05 22:34:13 -06:00
Jerry Wester
24da462693
you can put your dick in it, but in reverse
2022-05-05 12:47:40 -06:00
BongaTheProto and GitHub
587051c249
Merge branch 'Sandstorm-Station:master' into master
2022-04-27 16:13:35 -05:00
SandPoot
1b62569d2b
handle signals correctly
2022-04-27 17:51:58 -03:00
BongaTheProto
54aec9bd98
Merge remote-tracking branch 'upstream/master'
2022-02-27 14:38:06 -05:00
SandPoot
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
SandPoot
3911629b38
Upload files
2022-01-18 17:11:54 -03:00
SandPoot
d46990f902
Finishing the strip menu
2021-12-31 14:26:32 -03:00
SandPoot
9a633b5395
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-12-31 14:07:43 -03:00
SandPoot
377a5da6d6
yeah... wrong.
2021-11-03 18:54:51 -03:00
SandPoot and GitHub
e467d24d0b
Update fleshlight.dm
2021-11-03 17:43:38 -03:00
SandPoot and GitHub
f753617a0b
Updates some lewd stuff ( #189 )
2021-11-03 13:59:02 -03:00
SandPoot and GitHub
983fc006a3
Makes interactions generation into a subsystem ( #188 )
...
* Upload files
* Update interactions.dm
2021-11-01 00:27:07 -03:00
SandPoot and GitHub
f94c76bea6
Adds fleshlights ( #187 )
...
* Upload files
* Update files
* Update objects.dm
nobody saw this shameful webedit.
2021-10-12 23:00:03 -03:00
BongaTheProto