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-17 05:12:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

526 Commits

Author SHA1 Message Date
BongaTheProto
3eb5d65576 Breastfeeding broke (#246) 
* datums aren't hot

* ok
 2022-04-21 11:49:58 -03:00
BongaTheProto
479b497b00 ok 2022-04-19 01:30:44 -05:00
AManWithAToolbox
dda0869f82 Merge branch 'pr/1' into its-wasnt-gonna-happen 2022-04-18 23:19:18 -05:00
BongaTheProto
e91d947881 for fuck's sake 2022-04-18 22:25:45 -05:00
BongaTheProto
6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05:00
BongaTheProto
557fbe7803 back home 
this works apparently...?
 2022-04-18 21:19:35 -05:00
nullfag
aad3c9cc6c the fuckening 2022-04-18 00:52:36 +02:00
SandPoot
05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
Prods
940d9acf09 Update kinkmate.dm 
Add sounding rod item to kinkmate.
 2022-04-14 16:19:31 -04:00
SandPoot
7aa54845d7 Changes some lewd stuff (#244) 
* Upload files

* bad practices
 2022-04-10 22:34:47 -03:00
BongaTheProto
4f0a58c980 small follow-up fixes 
to a4fac709c3
 2022-04-09 12:16:19 -05:00
SandPoot
5a6a6deff3 Update mecha.dm 2022-04-09 14:07:02 -03:00
BongaTheProto
a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05:00
SandPoot
4f467897e3 fix for our stuff 2022-04-09 03:01:10 -03:00
SandPoot
ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
BongaTheProto
3a9806ca4b Merge remote-tracking branch 'upstream/master' 2022-04-07 04:23:12 -05:00
SandPoot
369b339318 quick fixes the bsminer 2022-04-07 02:19:13 -03:00
BongaTheProto
9db6eccd75 Merge pull request #268 from radar651/generalupdates 
General updates
 2022-04-06 17:47:58 -05:00
BongaTheProto
f5af499eee Merge branch 'Sandstorm-Station:master' into master 2022-04-06 16:01:25 -05:00
SandPoot
d6252c7adf Does some fine tweaks on the bluespace miner, no real major changes yet. (#241) 2022-04-06 16:35:38 -03:00
radar651
076e12a829 Ready 
Ready for test merg
 2022-04-04 16:20:45 -05:00
BongaTheProto
b601e94958 Merge remote-tracking branch 'upstream/master' 2022-03-31 00:14:54 -05:00
SandPoot
627a3e0b76 Butt prefs 2022-03-31 00:32:53 -03:00
radar651
a3499ae02c Merge branch 'master' into cargonia 2022-03-29 19:20:07 -05:00
BongaTheProto
83a8b04d46 Merge branch 'Sandstorm-Station:master' into master 2022-03-29 18:51:40 -05:00
SandPoot
150e12a895 Rebalance Prices (#239) 2022-03-29 18:59:10 -03:00
radar651
74766c94f2 Merge branch 'SPLURT-Station:master' into cargonia 2022-03-28 18:23:08 -05:00
radar651
b2e58b0681 Fixes 
Adjust some RNG tables and location of some thigns not being in the Syndi section when they are suppose to be.
 2022-03-28 17:54:56 -05:00
BongaTheProto
9bbb96a376 Bodywriting 
now available to genitals!
 2022-03-27 03:33:28 -05:00
radar651
f816373439 Ready for merg 
At least I hope so
 2022-03-26 05:21:06 -05:00
radar651
57c913a1db Merge branch 'master' into cargonia 2022-03-24 10:39:30 -05:00
radar651
d01a0c9d7c HOly shit 
I am doing a lot
 2022-03-24 09:48:55 -05:00
BongaTheProto
520c3f7da3 Merge remote-tracking branch 'upstream/master' 2022-03-23 07:26:49 -05:00
SandPoot
8359e0cce8 Fixes uplink items fetching (#237) 
* Upload files

* flags, not items
 2022-03-22 18:13:44 -03:00
BongaTheProto
a1a3b3fc93 Merge remote-tracking branch 'upstream/master' 2022-03-20 21:24:52 -05:00
SandPoot
470b02443d Reorganizes code/__DEFINES/sandcode (#236) 
* Upload files

* GLOBAL_LIST_INIT() used before being defined
 2022-03-20 21:02:45 -03:00
BongaTheProto
f10b89515e Merge pull request #245 from CloverIsLucky/patch-2 
[Semi-modular]Shambler mask nerf.
 2022-03-10 20:01:51 -06:00
BongaTheProto
7af61efa52 Merge remote-tracking branch 'upstream/master' 2022-03-10 20:30:08 -05:00
SandPoot
1825d224bf Fuck 2022-03-09 23:56:02 -03:00
SandPoot
357e11cd84 Better fix of this big stupid 2022-03-09 23:49:44 -03:00
CloverIsLucky
1813d21438 Shambler mask nerf. 
Now IT is a more cheaper version of colossus' blaster flutes.
 2022-03-09 20:39:39 -06:00
BongaTheProto
9b7283a751 Merge branch 'Sandstorm-Station:master' into master 2022-03-06 20:32:00 -06:00
BongaTheProto
ffb0fe1bb6 Fixes tops (#234) 2022-03-06 22:13:22 -03:00
BongaTheProto
943e5d742a Merge branch 'Sandstorm-Station:master' into master 2022-03-05 11:42:25 -06:00
SandPoot
d67b4db4ad Fix looking at someone's shown item 2022-03-05 13:19:13 -03:00
SandPoot
43cac7ff46 Abuse this ya fucks. 2022-03-05 12:36:49 -03:00
BongaTheProto
8eef5107da Merge branch 'Sandstorm-Station:master' into master 2022-03-04 18:37:53 -06:00
BongaTheProto
a7095a655f Fix (#232) 2022-03-04 21:20:25 -03:00
SandPoot
45580ae0e2 unused 2022-03-04 13:33:32 -03:00
SandPoot
1275e0b11c a bit wrong 2022-03-04 13:21:15 -03:00