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 2026-08-30 08:07:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,073 Commits 55 Branches 0 Tags
9b8ce2457dd9658898523bd135ed6f3f6db1e6e7
Commit Graph
22412 Commits
Author SHA1 Message Date
BongaTheProtoandGitHub 9b8ce2457d Merge pull request #938 from SPLURT-Station/tram-surname-station 
Ports modular ruins
 2023-08-25 00:32:33 -05:00
BongaTheProto 1ba8d0f7f0 Merge branch 'pr/834' 2023-08-22 18:26:12 -05:00
Yawet330andGitHub fbfa55ad77 Update mobs.dm 2023-08-22 15:59:16 +01:00
BongaTheProto b6dc33fb2e modular map loader 
yep
 2023-08-18 20:04:20 -05:00
BongaTheProtoandGitHub 6ae55be3f4 Merge pull request #919 from SPLURT-Station/borgos 
Borg sprite updates
 2023-08-17 14:21:20 -05:00
BongaTheProtoandGitHub ef288b1d2a Merge pull request #926 from Yawet330/master-1 
Privacy PR
 2023-08-15 01:16:55 -05:00
BongaTheProtoandGitHub a257032907 Merge pull request #924 from Tsurupeta/banishing-of-harddels 
Banishing of harddels
 2023-08-15 00:41:11 -05:00
BongaTheProto 4056ac8165 Merge branch 'master' into borgos 2023-08-13 01:48:13 -05:00
BongaTheProto a965da14aa mekas 
why they look like that ps4 game tho
 2023-08-13 01:47:54 -05:00
BongaTheProtoandGitHub 883e02d108 Merge pull request #892 from K4rlox/master 
Resonators now resonate to nearby ores
 2023-08-12 13:03:06 -05:00
Yawet330andGitHub be03e8c46e Update ooc.dm 2023-08-11 15:05:06 +01:00
BongaTheProtoandGitHub eb3d2de3ed Merge pull request #920 from NopemanMcHalt/gib_sign_language_to_borgs 
[SEMI-MODULAR] Makes cyborgs/robots to understand the sign language, but not speak it. Also adds appropriate icon for it.
 2023-08-09 15:06:02 -05:00
Yawet330andGitHub 7e6234096c Update ooc.dm 2023-08-09 21:01:27 +01:00
K4rloxandGitHub abe13b4a18 Merge branch 'SPLURT-Station:master' into master 2023-08-08 17:46:10 +03:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
Tsurupeta d4f3793f8f QDEL_IN improvements 2023-08-08 14:01:16 +03:00
Tsurupeta eca4935865 reftracking 2023-08-08 14:01:16 +03:00
BongaTheProtoandTsurupeta dfdbd259da unit test 
this is the easy part, believe it or not
 2023-08-08 14:01:13 +03:00
BongaTheProto cdd5bb87d8 Merge remote-tracking branch 'upstream/master' 2023-08-08 01:42:46 -05:00
BongaTheProto a14737516e Update breasts.dm 2023-08-06 19:55:12 -05:00
BongaTheProto b7918a14e5 Update breasts.dm 2023-08-05 23:58:08 -05:00
BongaTheProto 668e26e83a why wasn't this reported 
do people make their genitals the size of the fucking solar system anymore even?
 2023-08-05 23:39:02 -05:00
SandPoot 4b9488a9b3 right codebase! 2023-08-05 14:05:00 -03:00
SandPoot 8bf6e9ffcc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-08-05 13:51:50 -03:00
LinandGitHub 1ed893f16d Merge pull request #15995 from SandPoot/orbit-jobs 
Shows people's jobs on the orbit menu
 2023-08-05 12:47:56 -04:00
Anonymous 6090ac9a3b Some basic sign language QoL 
- Added a proper icon for the Sign Language;
 - Borgs now understand it, but cannot "speak" it.

Unintentional Changes:
 - .dme re-sorted itself due me using BYOND maker for spriting.
 2023-08-05 13:49:51 +03:00
SandPoot 6fb4267b56 upload 2023-08-04 23:26:33 -03:00
SandPoot c54ce2d09d wrong codebase 2023-08-04 00:16:53 -03:00
SandPoot 403c49afab push 2023-08-04 00:11:08 -03:00
BongaTheProto 83bb8a2e11 haydee 
that ass better fart
 2023-08-03 03:11:05 -05:00
BongaTheProto 5382130370 Squashed commit of the following: 
commit 0081f9fa79
Author: Sandstorm Bot <85452301+Sandstorm-Bot@users.noreply.github.com>
Date:   Mon Jul 31 18:40:02 2023 +0000

    Automatic changelog compile [ci skip]

commit 94be79788c
Merge: 13da11c4bc ee540149d8
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:38:17 2023 -0300

    Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

commit ee540149d8
Merge: c317c8b8fc 410d80987e
Author: silicons <2003111+silicons@users.noreply.github.com>
Date:   Mon Jul 31 11:37:20 2023 -0700

    Merge pull request #15994 from SandPoot/quick-fix-1

    Fixes changeling's stings

commit 13da11c4bc
Merge: 8b56f314e6 c317c8b8fc
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:36:19 2023 -0300

    Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

commit 410d80987e
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:04:52 2023 -0300

    nope, who OWNS it

commit 860f75d464
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:02:51 2023 -0300

    go

commit c317c8b8fc
Merge: 19dee4e0f6 bfe07112ff
Author: silicons <2003111+silicons@users.noreply.github.com>
Date:   Sun Jul 30 10:49:51 2023 -0700

    Merge pull request #15993 from SandPoot/station-name

    New Station Trait: Randomizing Station Name

commit bfe07112ff
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Fri Jul 28 13:53:09 2023 -0300

    i hate keyed_list, i'm not keeping it in

commit 6896a2e481
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Thu Jul 27 21:09:41 2023 -0300

    what was it again?
 2023-08-01 00:22:39 -05:00
SandPoot 94be79788c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-31 15:38:17 -03:00
SandPoot 410d80987e nope, who OWNS it 2023-07-31 15:04:52 -03:00
SandPoot 860f75d464 go 2023-07-31 15:02:51 -03:00
BongaTheProto ea324c5bc1 Merge remote-tracking branch 'upstream/master' 2023-07-28 20:43:43 -05:00
SandPoot 789534ac63 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-28 18:36:03 -03:00
SandPootandGitHub 9421423ed5 Merge branch 'master' into changeling-update 2023-07-26 22:22:14 -03:00
SandPoot 11aa13e4e8 part 1 - 41928 2023-07-26 21:45:43 -03:00
BongaTheProtoandGitHub 2ede3a6f60 Merge pull request #913 from JMoldy/vomitfix 
Makes vomiting clear some disgust
 2023-07-26 19:41:45 -05:00
JMoldy 42b1aa7693 Makes vomiting clear some disgust 2023-07-26 16:49:13 -05:00
BongaTheProto e87e828638 Merge remote-tracking branch 'upstream/master' 2023-07-25 22:47:02 -05:00
SandPoot 7e51ef0b98 fix merge 2023-07-23 19:06:55 -03:00
SandPoot ef186347ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-23 18:56:20 -03:00
LinandGitHub b1f6271cb5 Merge pull request #15991 from SandPoot/screenhints 
Adds a couple hints to things
 2023-07-23 16:52:31 -05:00
BongaTheProto 2b718295d3 Merge remote-tracking branch 'upstream/master' 2023-07-23 13:41:11 -05:00
SandPoot 994ff214d5 ? 2023-07-23 15:06:20 -03:00
SandPoot 8b66a57665 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-21 00:23:16 -03:00
LinandGitHub 77df8655e0 Merge pull request #15990 from SandPoot/lobby-collapse 
Collapsible lobby buttons
 2023-07-20 11:55:29 -05:00
BongaTheProto 650642d379 Merge remote-tracking branch 'upstream/master' 2023-07-20 00:23:25 -05:00
SandPoot 3645d00ec0 alright then 2023-07-19 21:15:52 -03:00