cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-24 16:53:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

315 Commits

Author SHA1 Message Date
StrangeWeirdKitten
e081972ebc fixes 2021-12-15 19:38:12 -07: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
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
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
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
E
0592520bea fixes runtimes 2021-12-06 20:36:46 +01:00
StrangeWeirdKitten
c0e3ca5966 Merge branch 'master' into lewd-fixes 2021-12-03 16:54:27 -07:00
StrangeWeirdKitten
04166cd492 Fixes a couple bugs 2021-12-03 16:46:35 -07:00
StrangeWeirdKitten
196cebff53 Merge branch 'master' into Lewd-Clothes 2021-12-02 20:14:16 -07:00
StrangeWeirdKitten
11715f36ba Finishing Touches 
The PR is now finished.
 2021-12-02 19:51:28 -07:00
E
4a89819487 titles 2021-12-02 15:09:16 +01:00
StrangeWeirdKitten
8ea79b0128 latexxx 2021-12-02 05:50:08 -07:00
DrNukesky
d7f50c7aba New job title for assistant 
New "Blacksmith" alt job title added to assistant.

Quite a sounding job title for those who want to do blacksmithing at the station. Plus, it's a pretty good reason to bother the cargo department with ordering a normal anvil.
 2021-12-01 08:43:39 +02:00
BongaTheProto
2e47d1e3e3 Merge branch 'Sandstorm-Station:master' into master 2021-11-30 17:12:27 -05:00
SandPoot
e4e6b41bf7 Update some stuff 2021-11-30 18:07:11 -03:00
StrangeWeirdKitten
e61495c3c4 Mind Collar 2021-11-30 12:14:07 -07:00
StrangeWeirdKitten
01aa0dfc8a Hypnogoogles 2021-11-30 09:35:54 -07:00
StrangeWeirdKitten
9653dca774 Revert "Revert "Lewd Clothes [WIP]"" 
This reverts commit a9bf05e651.
 2021-11-30 07:33:55 -07:00
StrangeWeirdKitten
a9bf05e651 Revert "Lewd Clothes [WIP]" 
This reverts commit 2147cf0623.
 2021-11-30 07:32:37 -07:00
StrangeWeirdKitten
2147cf0623 Lewd Clothes [WIP] 
Ports some stuff from skyrat. Very much a WIP.
 2021-11-29 21:00:28 -07:00
E
73879ad66f fixes gladi not reckognising ashies 2021-11-29 17:42:07 +01:00
E
333f0a7da8 megres with boob 2021-11-29 17:30:51 +01:00
E
1924387f2f minors get sepsis 2021-11-29 15:41:40 +01:00
E
57b3b08896 pull fix 2021-11-29 01:15:58 +01:00
BongaTheProto
88b2ecbfd5 Fixed goat ears 
Now they actually have color + made a small fix for a runtime, delete if it breaks everything even more
 2021-11-28 01:46:44 -05:00
BongaTheProto
d3dde16e2e Merge branch 'Sandstorm-Station:master' into master 2021-11-27 18:00:00 -05:00
BongaTheProto
09d1bebb45 Fixes rings errors (#199) 2021-11-27 19:57:17 -03:00
BongaTheProto
f60fafb3d8 Merge remote-tracking branch 'upstream/better-size-code' into better-size-code-splurt 2021-11-21 00:03:18 -05:00