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
56,903 Commits 55 Branches 0 Tags
some-updates
Commit Graph
917 Commits
Author SHA1 Message Date
BongaTheProto 1e1fc329f8 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-04-13 14:12:39 -05:00
SandPoot 002a4c31c1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-12 22:06:15 -03:00
SandPoot ca8ce67cd6 mail 2024-04-10 20:54:04 -03:00
BongaTheProto b2e14a5393 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-03-24 17:02:38 -05:00
SandPoot b76127c2d7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-15 19:21:39 -03:00
SandPoot 8516b07eee please do not end your paths with / 2024-03-13 14:43:40 -03:00
SandPoot 676cb864b1 missed proc refs 2024-03-12 22:17:30 -03:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
BongaTheProto d1b0e9ec9f Merge remote-tracking branch 'upstream/master' 2024-03-01 21:15:28 -05:00
SandPoot 0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
BongaTheProto 13cd269788 Merge remote-tracking branch 'upstream/master' 2023-12-25 14:28:51 -05:00
SandPoot be37603291 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-23 13:28:41 -03:00
SandPoot 7b62dbe7bb ai + mech 2023-12-17 23:15:59 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
BongaTheProto 5116acad15 Merge remote-tracking branch 'upstream/master' 2023-05-06 18:31:55 -05:00
SandPoot 7038059ab5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-05-06 10:47:06 -03:00
KrissKr0ss 66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits" 
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
 2023-05-01 00:16:20 -05:00
BongaTheProto 0cfe8e33eb Merge remote-tracking branch 'upstream/master' 2023-02-12 21:42:34 -05:00
SandPoot 2b8a20bae2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-12 22:59:51 -03:00
President of Shit PRS 71d588f33d Update bounty_console.dm 2023-01-14 04:00:48 +00:00
President of Shit PRS d063144713 Re-Adding Bounty Consoles 
Civilian bounties are great, don't get me wrong. But they're civilian bounties and it feels like cargo lost their thing to do, namely putting annoying sheets of paper everywhere. Plus checklists make the brain go ding when you work through them arooga.
 2023-01-14 02:01:12 +00:00
SandPoot d743096f8a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-09 17:50:19 -03:00
Jerry WesterandGitHub ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
SandPoot 82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
siliconsandGitHub 23327fa268 Merge pull request #15894 from JerryWester/modsuits 
MODsuits
 2023-01-07 14:07:28 -08:00
BongaTheProto 8034d9fb22 Merge remote-tracking branch 'upstream/master' 2022-12-31 14:31:12 -05:00
SandPoot d337852c68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-28 16:56:04 -03:00
HatterhatandGitHub 3ea2c35832 mismatch 2022-12-23 02:25:26 -06:00
Jerry WesterandGitHub 32a5d02434 Merge branch 'master' into modsuits 2022-12-13 19:18:24 -07: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
Jerry Wester f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
PeriodicChaosandJerry Wester 183b554ed3 modsuits part 1 2022-12-11 20:30:41 -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
BongaTheProto 79fa770ab3 Merge remote-tracking branch 'upstream/master' 2022-10-13 11:21:32 -05:00
SandPoot 5384cb9d4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-12 22:25:25 -03:00
siliconsandGitHub f7937e54e0 Merge pull request #15860 from shellspeed1/public-bounties 
Port of public bounties and the sales tagger from tg.
 2022-10-12 03:27:37 -07:00
BongaTheProto e1cb9c8346 Merge remote-tracking branch 'upstream/master' 2022-09-27 23:19:10 -05:00
SandPoot f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03:00
siliconsandGitHub a8ef986ce5 Merge pull request #15848 from shellspeed1/full-auto-port-from-tg-Credit-to-Fikou 
Port of a bunch of stuff to update guns at this point because we have a bunch of stuff we are missing.
 2022-09-23 16:27:03 -07:00
shellspeed1 a55b2c4ff3 ports https://github.com/tgstation/tgstation/pull/56375. Credit to cacogen. 2022-09-20 20:05:59 -07:00
shellspeed1 cdb1fbb1e2 port of https://github.com/tgstation/tgstation/pull/54029/files# Aka this is where we get bounty cubes and remove the public bounty console. Credit to ArcaneMusic. 2022-09-18 21:55:10 -07:00
BongaTheProto 9cdaffc417 Merge remote-tracking branch 'upstream/master' 2022-09-18 23:40:20 -05:00