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-14 11:52:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,249 Commits 55 Branches 0 Tags
f945deb3f73a5b51ff9afd66e15346aeddb7aae3
Commit Graph

2421 Commits

Author SHA1 Message Date
BongaTheProto
f1ed056576 Merge remote-tracking branch 'upstream/master' 2022-09-28 15:26:54 -05:00
SandPoot
a2baf4e789 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-28 15:14:24 -03:00
silicons
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
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
BongaTheProto
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 Teakettle
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
Kylerace
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
SandPoot
550db1b6ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-20 17:27:19 -03:00
silicons
18b797d0f4 Merge pull request #15758 from LetterN/patch-12 
fix pod not unlocking on code delta
 2022-08-20 12:27:11 -07:00
BongaTheProto
b2b78d7db8 Merge branch 'Sandstorm-Station:master' into master 2022-08-17 01:27:55 -05:00
SandPoot
7fef29cbb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-16 21:14:05 -03:00
Lin
357f266e30 Merge pull request #15774 from deathride58/firewallfix 
[S] fixes small fail2topic vulnerability
 2022-08-16 21:02:10 +00:00
BongaTheProto
66026ccc07 Merge remote-tracking branch 'upstream/master' 2022-08-16 11:05:20 -05:00
SandPoot
1e29739a34 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-16 03:23:37 -03:00
Putnam3145
c6cf921e7a Makes station trait on round start work 2022-08-14 23:29:40 -07:00
deathride58
2f4a095363 blacklists rule_name varedits 2022-08-09 18:40:02 -04:00
deathride58
f7ae896aeb fixes small fail2topic vulnerability 2022-08-09 18:22:02 -04: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
Letter N
a529575819 Update security_level.dm 2022-08-08 09:00:05 +08:00
Putnam3145
b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
Letter N
29324f5e47 lazy implementation 2022-08-05 22:29:11 -07:00
BongaTheProto
74797a79be Merge branch 'Sandstorm-Station:master' into master 2022-08-05 23:15:43 -05:00
SandPoot
bf0c0f530d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-05 19:09:18 -03:00
Hatterhat
2155a8bdce funny ammo 2022-08-03 06:11:04 -05:00
BongaTheProto
9e980f825f Merge remote-tracking branch 'upstream/master' 2022-08-01 17:19:36 -05:00
SandPoot
c7088af077 doesn't work 2022-08-01 12:44:40 -03:00
BongaTheProto
e72c2886ae Merge remote-tracking branch 'upstream/master' 2022-07-29 22:07:41 -05:00
SandPoot
9f32accd41 no 2022-07-29 18:15:50 -03:00
SandPoot
8220c3bc10 round timer test 2022-07-29 18:15:03 -03:00
BongaTheProto
811c1df810 Merge remote-tracking branch 'upstream/master' 2022-07-24 12:05:49 -05:00
SandPoot
0a0e4de14b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-24 02:59:28 -03:00
deathride58
fc74dd8a69 maps, filenames, and DME 2022-07-20 17:19:27 -04:00
deathride58
578eb440c1 If you know, you know; fixes a decade-old typo, essentially mirroring RP's typo fix 2022-07-20 16:51:38 -04:00
BongaTheProto
8a45cb89fa Merge remote-tracking branch 'upstream/master' 2022-06-13 21:33:35 -05:00
SandPoot
bc25a077ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-13 12:01:51 -03:00
deathride58
4ea1a44e85 fixes jukebox audio not coming through containers 2022-06-11 00:48:35 -04:00
BongaTheProto
6d385f2b2e Merge remote-tracking branch 'upstream/master' 2022-06-07 19:10:13 -05:00
SandPoot
78b4d94c96 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-07 17:00:44 -03:00
Lin
0429ff2b99 Merge pull request #15658 from deathride58/admindeobfuscationfix 
Fixes a bug in admin vote deobfuscation
 2022-06-07 05:42:36 +00:00
BongaTheProto
488e0a295f You mfs can't be pleased 
makes the new menu a toggle
 2022-06-05 14:58:49 -05:00