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-23 12:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
776 Commits
Author SHA1 Message Date
BongaTheProto 2d1d665e41 Revert "Merge remote-tracking branch 'upstream/master'" 
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
 2023-12-16 10:48:35 -05:00
BongaTheProto c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot d7942e1365 button 2023-12-10 00:50:10 -03:00
BongaTheProto fb1dc86226 Merge remote-tracking branch 'upstream/master' 2023-09-03 18:06:53 -05:00
SandPoot f53a7a1f40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-09-03 17:47:27 -03:00
Katherine Kiefer 16a490ee5c update auxmos 2023-08-18 22:13:30 +10:00
BongaTheProto d08cb554e9 Merge branch 'master' into pr/660 2023-02-13 14:09:17 -05:00
BongaTheProto ce464a6903 Merge remote-tracking branch 'upstream/master' 2023-02-11 21:25:29 -05:00
SandPoot b62b5c3e12 fix more alt titles 2023-02-11 14:02:22 -03:00
BongaTheProto 2eccd56e6b Merge branch 'master' into pr/660 2023-02-03 19:48:12 -05:00
Darius fce50e1b81 Add roleplay brain trauma toys 
Adds arcade machine prizes that grant roleplay-oriented brain traumas; Split Personality and Imaginary Friend. Each item is single use.
 2023-02-01 16:31:48 -05:00
BongaTheProto 8a53e33271 Merge branch 'master' into pr/660 2023-01-28 22:11:29 -05:00
Darius d7997fbdf9 Remove quirk DNC 
Removes the DNC quirk, as the upstream merge makes it redundant.
 2023-01-22 11:44:54 -05:00
BongaTheProto 620380e188 Merge remote-tracking branch 'upstream/master' 2023-01-21 13:15:29 -05:00
SandPoot 54192d4d0d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-20 21:35:34 -03:00
SandPoot 0ebcf0b72f stuff 2023-01-16 18:16:32 -03:00
Neyusha 580bd31e12 Stowaways Role 2022-12-27 11:45:20 +03:00
DrNukeskyandGitHub cc37faf664 Fixing "Buy slaves" button on communication 2022-12-23 20:51:38 +02:00
BongaTheProto ee6823c69b Merge remote-tracking branch 'upstream/master' 2022-12-13 12:14:11 -05:00
SandPoot f4b7513f10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-13 01:35:33 -03:00
LinandGitHub 7205781c47 Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song 
Solves some harddels
 2022-12-12 19:11:49 -07:00
SandPoot 8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
BongaTheProto a949e5d08c Merge remote-tracking branch 'upstream/master' 2022-10-28 16:43:28 -05:00
SandPoot 02e4551a27 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-25 22:52:45 -03:00
LinandGitHub 03c62f4359 Merge pull request #15876 from SandPoot/fix-deadchat_broadcast 
Fixes deadchat_broadcast
 2022-10-25 04:36:00 +00:00
SandPoot 24ee6077c7 push changes 2022-10-23 00:18:03 -03:00
zerothebigboy b409db3505 yeppers 2022-10-17 19:16:26 -04:00
BongaTheProto 9cdaffc417 Merge remote-tracking branch 'upstream/master' 2022-09-18 23:40:20 -05:00
SandPoot cc9c36bd13 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-17 22:48:51 -03:00
shellspeed1andGitHub 236e9e5e0c ports launchpad targeting icon. (#15844) 2022-09-17 13:40:32 -07:00
BongaTheProto 9e7c5033cc Merge remote-tracking branch 'upstream/master' 2022-08-07 21:42:16 -05:00
SandPoot 00dadda3df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 23:15:57 -03:00
Putnam3145 e1c822cbd8 TGUI; actually fixes station announcer 2022-08-07 17:17:58 -07:00
BongaTheProto 04d9c7d167 Merge remote-tracking branch 'upstream/master' 2022-06-04 13:25:54 -05:00
SandPootandGitHub 229b618dee CRISPR for Base Gene editing (#258) 
* push the content

* tiny update
 2022-06-03 21:29:19 -03:00
BongaTheProto f4b9585c12 Merge remote-tracking branch 'upstream/master' 2022-05-12 20:47:56 -05:00
SandPoot b73b49a8b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-12 17:18:28 -03:00
SandPoot 90eab441aa Upload files 2022-05-09 18:50:17 -03:00
BongaTheProto 6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
BongaTheProto a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05:00
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
BongaTheProto ddd36b40cf Merge part 2 
Yeah this should fix everything with the update
 2022-02-27 14:39:07 -05:00
BongaTheProto ffcca5c46b Merge remote-tracking branch 'upstream/master' 2022-02-08 01:16:02 -05:00
SandPoot 7523279254 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-07 22:07:59 -03:00
siliconsandGitHub af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460) 
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
 2022-02-07 15:17:24 -08:00
James ec54dacb23 Lots of changes 
Adds fan to stop air escaping
Adds turrets to slave shuttle, default setting to stun
Adds a few more buyable slave shipments
Modifies shipment costs to be cheaper
Stops the station from being able to spam the slaver comms by rapidly buying/unbuying a slave
Allows the slavers to edit a slave's price
using the traitor panel to add slaver status to a player no longer teleports them to the slaver spawn or wipes their existing gear.

And other stuff I can't remember
 2022-01-29 22:54:09 +00:00