Commit Graph

526 Commits

Author SHA1 Message Date
BongaTheProto
3dd0bc8efb Merge remote-tracking branch 'upstream/master' 2021-12-22 14:30:34 -05:00
Hartmann-von-Berlichingen
f8f94e4259 modular_splurt'd teh code uwu 2021-12-22 22:07:00 +03:30
SandPoot
0b2b73381f size stuff 2021-12-22 15:22:25 -03:00
SandPoot
5263ec27d5 clears out some double spaces 2021-12-22 14:46:22 -03:00
BongaTheProto
ac961bd95a Upgraded interactions (kinda) (#213) 2021-12-22 14:34:07 -03:00
Hartmann-von-Berlichingen
a8d52f64a3 pixelshift fix and new borg resizer
replaced my earlier pr of a temp fix for borg resizers.
New content: borg expander and shrinker have custom settings now. as a carbon hold and use in hand, then set the size you like within the range, featuring a little message to confirm what you chose. then, using it on the borg will apply the resize to what you set.
2021-12-22 20:43:31 +03:30
Hartmann-von-Berlichingen
41dff6a9ad revert temp fix 2021-12-22 13:55:15 +03:30
BongaTheProto
efd990496a small fix 2021-12-20 15:26:44 -05:00
Hartmann-von-Berlichingen
c8bf7275a5 Set pixel fixing for borg expander 2021-12-20 14:33:08 +03:30
BongaTheProto
5ccde6b4a3 action fail? 2021-12-16 12:32:44 -05:00
BongaTheProto
f8515d9495 Update interaction_interface.dm 2021-12-16 12:18:44 -05:00
BongaTheProto
d7dfd274a2 Merge pull request #83 from StrangeWeirdKitten/fixes-lewd-things
Fixes Lewd Stuff x2
2021-12-15 23:07:27 -05:00
StrangeWeirdKitten
2fab1b181e ops 2021-12-15 20:33:46 -07:00
StrangeWeirdKitten
90b15aaa44 quick fix 2021-12-15 20:26:24 -07:00
StrangeWeirdKitten
e081972ebc fixes 2021-12-15 19:38:12 -07:00
BongaTheProto
5d9201f2c1 Vibrator fix + better xeno queen sprite 2021-12-15 13:40:21 -05:00
BongaTheProto
1dae313e3d Update vibrator.dm 2021-12-14 19:12:47 -05:00
BongaTheProto
a2b2b73a51 Fixed vibrators and made a better removal system
From now on you use a common removal verb, also if you're going to add any objects that are supposed to go on genitals try to use the genital_equipment class
2021-12-13 19:50:54 -05:00
BongaTheProto
abcbe3af09 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 2021-12-13 01:32:02 -05:00
BongaTheProto
65696e53c7 aaaaaaa
aaaaaaaaaa
2021-12-13 01:30:47 -05:00
BongaTheProto
e03bb9697b Merge branch 'Sandstorm-Station:master' into master 2021-12-12 23:21:57 -05:00
SandPoot
dbbe132c57 Layer changing verbs (#210) 2021-12-12 23:46:45 -03:00
BongaTheProto
4e494f5b23 FINISHED (I think)
bellY!!!!!!!
2021-12-12 03:51:05 -05:00
BongaTheProto
46b4e72e4f *huff* almost *huff* there
only reactions left
2021-12-12 01:10:57 -05:00
BongaTheProto
646e404c15 I've acquired knowledge
still gotta learn more tgui bc idk how it works
2021-12-11 18:54:53 -05:00
BongaTheProto
2faae48f08 why would you want to deflate something so beautiful anyways? 2021-12-11 17:10:07 -05:00
BongaTheProto
9bf08bc118 Merge branch 'master' into belly 2021-12-11 15:39:39 -05:00
BongaTheProto
f3aec6cb79 Merge remote-tracking branch 'upstream/master' 2021-12-11 15:20:50 -05:00
SandPoot
54c0cfe9fa Quick-fix 2021-12-11 17:18:08 -03:00
SandPoot
7b34851794 Adds functionality to dressers once again (#209) 2021-12-11 16:52:48 -03:00
BongaTheProto
d99c468053 Merge branch 'Sandstorm-Station:master' into master 2021-12-11 12:49:56 -05:00
SandPoot
67719f786d Sanity is now visible around your mood (#208) 2021-12-11 14:46:47 -03:00
BongaTheProto
69eec04a7d It works as it is right now
yes
2021-12-11 02:08:53 -05:00
BongaTheProto
cebd238492 Merge branch 'Sandstorm-Station:master' into master 2021-12-10 22:29:48 -05:00
SandPoot
938b9bcaa7 quick fix 2021-12-11 00:27:19 -03:00
BongaTheProto
dc015e6c02 Update recipes_misc.dm
these recipes are broken
2021-12-10 19:51:52 -05:00
BongaTheProto
b36a6c73e3 sounding + couple fixes
yup
2021-12-10 13:56:23 -05:00
BongaTheProto
5d55affd90 Lots of fucking shit
- vibrators
- slutcurity stuff
- condoms
2021-12-10 11:39:53 -05:00
BongaTheProto
7cc84b0118 Merge branch 'master' into missing-items-2 2021-12-09 14:11:37 -05:00
BongaTheProto
ea1312fae7 Merge remote-tracking branch 'upstream/master' 2021-12-09 12:51:02 -05:00
BongaTheProto
03dacc17e6 preparing for better size stuff
aaaaaaaaaaaaaaa
2021-12-09 12:39:19 -05:00
SandPoot
6790009f7a Size Stuff (#206)
* Upload files

* Update holder_micro.dm

* Upload files
2021-12-09 14:13:27 -03:00
SandPoot
c28fb9952a Update _underwear.dm 2021-12-09 12:41:24 -03:00
E
5bbf607f87 crack distilled 2021-12-08 19:52:09 +01:00
BongaTheProto
0705a614e7 some organization + added raw vibrator object
skdfksoñksdñk
2021-12-07 19:17:17 -05:00
BongaTheProto
58e75ee58b Merge remote-tracking branch 'upstream/master' 2021-12-07 10:32:42 -05:00
BongaTheProto
b90720475f Merge pull request #62 from NullFag/uyt
fixes runtimes
2021-12-07 09:15:39 -05:00
BongaTheProto
c3068fc135 "Small" climax revamp (#203) 2021-12-07 10:57:35 -03:00
BongaTheProto
37bd2cbd43 Merge branch 'Sandstorm-Station:master' into master 2021-12-06 22:58:02 -05:00
BongaTheProto
96a9050414 Small fix (#202)
* Update necropolis_chests.dm

* Update necropolis_chests.dm
2021-12-06 23:45:17 -03:00