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 04:36:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
58,023 Commits 55 Branches 0 Tags
master
Commit Graph
2108 Commits
Author SHA1 Message Date
Comicao1 4feb5f5b35 Merge remote-tracking branch 'upstream/master' into xenoarch-new 2023-04-03 20:32:55 -03:00
Comicao1 a5cee0c4cb Merge remote-tracking branch 'upstream/master' into xenoarch-new 2023-04-03 19:31:53 -03:00
BongaTheProto 1f58235a4a Merge remote-tracking branch 'upstream/master' 2023-04-03 11:52:47 -05:00
SandPoot 9d214e2f9d Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-04-03 12:53:37 -03:00
Comicao1 d25175edb2 Done 2023-04-02 11:56:09 -03:00
LinandGitHub 654e5dad9d Merge pull request #15864 from Putnam3145/auxmos-2 
UPDATE AUXMOS TO 2.0.0 (TESTMERGE THIS HOLY CRAP)
 2023-04-01 00:17:22 -07:00
BongaTheProtoandGitHub a3cdbf3d1c Merge branch 'Sandstorm-Station:master' into master 2023-03-30 19:20:25 -05:00
SandPoot 66a61e52c6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-03-30 15:25:34 -03:00
Drulikar ad145751a7 Fix admin command to load away missions. 2023-03-26 00:01:04 -07:00
Comicao1 d1f6424325 Initial XENOARCH port 2023-03-14 19:25:05 -03:00
BongaTheProtoandGitHub d9d617bf8d Merge branch 'Sandstorm-Station:master' into master 2023-02-10 16:53:13 -05:00
SandPoot 65c38e9828 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-10 02:18:08 -03:00
Timothy TeakettleandGitHub 390dcbcea0 Merge pull request #15966 from SandPoot/accessory-equip 
Adds accessory quick-equip, a tab for it on the loadout and previews for accessories on the prefs screen
 2023-02-09 21:39:05 +00:00
SandPoot 5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
BongaTheProto 7146a5f2eb Merge remote-tracking branch 'upstream/master' 2023-01-30 17:02:01 -05:00
SandPoot 8ae64b1bd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-29 19:16:50 -03:00
SandPoot 54641ce201 send 2023-01-23 20:44:28 -03:00
T-I-MandGitHub e602dc6ef2 Game mode in status panel 2023-01-01 16:19:13 +03: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 f923e016e9 Merge remote-tracking branch 'upstream/master' 2022-10-28 18:44:15 -05:00
SandPootandGitHub a21a047c3d Fixes custom roundstart items (#272) 2022-10-28 20:30:36 -03:00
SandPoot 03dce922a1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-28 19:20:03 -03:00
BongaTheProto a949e5d08c Merge remote-tracking branch 'upstream/master' 2022-10-28 16:43:28 -05:00
IHOPMommyLich a18577a334 Lowering Threshold 
Lowers the base transfer vote threshold from 3 to 1.
 2022-10-25 23:00:22 -04: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
BongaTheProto f1ed056576 Merge remote-tracking branch 'upstream/master' 2022-09-28 15:26:54 -05:00
Putnam3145 67f2dad1d7 stop stealing the furniture from my house 2022-09-28 12:41:56 -07:00
SandPoot a2baf4e789 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-28 15:14:24 -03:00
siliconsandGitHub 93e8a69c4c Revert "Updates auxmos to 2.0.0" 2022-09-28 01:05:10 -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
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
Putnam3145 eb6a86f37f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxmos-2 2022-09-18 16:41:24 -07:00
Putnam3145 d95f5729cc wow i forgot some extremely important updates haha 2022-09-18 16:27:48 -07:00
BongaTheProtoandGitHub 1e7436ec63 Merge pull request #468 from Zirok-BYOND/lighting_underlays 
Port underlay lighting from tgstation
 2022-09-16 19:00:32 -05:00
BongaTheProto 08d73350d4 Merge remote-tracking branch 'upstream/master' 2022-09-13 20:51:06 -05:00
SandPoot 9ffe8e05e0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-13 20:02:52 -03:00
Timothy TeakettleandGitHub 3de3dc8e6f lets ghosts click a pAI device to download into it without a master (#15838) 
* yes

* Update pai.dm
 2022-09-13 12:41:36 -07:00
KyleraceandZirok 5d2d68edc4 Cherry-pick the merge commit for tgstation PR 58991, implementing underlay Lighting 
Implements underlay lighting, turning lightin objects into a datum, for details see the tgstation PR.
 2022-09-02 18:22:15 +02:00
BongaTheProto fb66dc2035 Merge remote-tracking branch 'upstream/master' 2022-08-23 20:30:19 -05:00
SandPoot 32535e69b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-23 18:31:23 -03:00
Putnam3145 656ca9950b fixes security levels 2022-08-22 16:38:54 -07:00
BongaTheProto 3341812b44 Merge remote-tracking branch 'upstream/master' 2022-08-20 17:16:19 -05:00