Commit Graph

51452 Commits

Author SHA1 Message Date
BongaTheProto
fded1c5dd6 Merge branch 'master' into donator-upgrade 2022-08-20 11:58:07 -05:00
BongaTheProto
cfb1e2caff Merge remote-tracking branch 'upstream/master' 2022-08-20 11:30:21 -05:00
SandPoot
6b481d2d66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-19 23:29:29 -03:00
Changelogs
3336390eb2 Automatic changelog compile [ci skip] 2022-08-20 00:51:25 +00:00
Changelogs
7ada7c18ff Automatic changelog compile [ci skip] 2022-08-19 23:29:07 +00:00
SPLURT Bot
244d7318e8 Automatic changelog generation for PR #441 [ci skip] 2022-08-19 23:27:49 +00:00
BongaTheProto
b1c48e431c Merge pull request #441 from SpookyTheFox/magriflefix
[BUG FIX] magrifle non-lethal magazine no longer says "null_reference_exception"
2022-08-19 18:26:17 -05:00
SpookyTheFox
bc0c929104 added a magazine name
hopefully fixes this, I don't like seeing null ref exceptions
2022-08-19 15:39:17 -07:00
CitadelStationBot
23f2bd4aee Automatic changelog generation for PR #15797 [ci skip] 2022-08-19 16:12:30 -05:00
Lin
c8104ec155 Merge pull request #15797 from Putnam3145/sandstorm-nerf
sandstorm nerf
2022-08-19 21:12:26 +00:00
BongaTheProto
e83330202a update rust_g
Will compile a cpu targeted version when I actually put it in the server

also we'll need someone to make an upgrade to our systems using the new rust_g stuff
2022-08-19 08:47:09 -05:00
CitadelStationBot
7e46dddb32 Automatic changelog generation for PR #15794 [ci skip] 2022-08-19 00:55:04 -05:00
Lin
f18d40f3a7 Merge pull request #15794 from zeroisthebiggay/patch-29
cauteries searing tools and energy scalpels now have heat and can be used to light cigarettes
2022-08-19 05:55:00 +00:00
CitadelStationBot
e6e7f704f4 Automatic changelog generation for PR #15795 [ci skip] 2022-08-19 00:54:25 -05:00
Lin
202d19976d Merge pull request #15795 from Putnam3145/fix-stake
Probably fixes bad stake behavior
2022-08-19 05:54:22 +00:00
CitadelStationBot
13875adb62 Automatic changelog generation for PR #15796 [ci skip] 2022-08-19 00:54:14 -05:00
Lin
0c8faf595e Merge pull request #15796 from Putnam3145/fix-auxmos-perf-linux
Makes linux performance on startup better
2022-08-19 05:54:11 +00:00
Changelogs
6d9ffa559b Automatic changelog compile [ci skip] 2022-08-19 05:00:05 +00:00
SPLURT Bot
256fcbb247 Automatic changelog generation for PR #440 [ci skip] 2022-08-19 04:58:48 +00:00
BongaTheProto
8538921f7f Merge pull request #440 from SPLURT-Station/the-nuclear-option
VPN autokicker
2022-08-18 21:57:24 -07:00
BongaTheProto
5e188a45d5 Update client_procs.dm 2022-08-18 23:34:28 -05:00
BongaTheProto
57e8bcf010 enough is enough
vpns are gay
2022-08-18 22:55:56 -05:00
Changelogs
a0d351bc22 Automatic changelog compile [ci skip] 2022-08-19 00:56:06 +00:00
Putnam3145
81cbda5cda announcement too 2022-08-18 01:15:34 -07:00
Putnam3145
6847ef3db5 sandstorm nerf 2022-08-18 01:13:05 -07:00
CitadelStationBot
440aac93d6 Automatic changelog generation for PR #15792 [ci skip] 2022-08-18 02:28:22 -05:00
Lin
8d2c38504f Merge pull request #15792 from BlueWildrose/problemfornightmares
Glowing goo no longer has persistence
2022-08-18 07:28:18 +00:00
CitadelStationBot
a87cc0724d Automatic changelog generation for PR #15793 [ci skip] 2022-08-18 02:28:11 -05:00
Lin
6b7fa87f96 Merge pull request #15793 from TripleShades/omega
Hey remember #15780
2022-08-18 07:28:08 +00:00
Putnam3145
6340292604 Makes linux performance on startup better 2022-08-17 22:56:02 -07:00
Putnam3145
228c637d76 Probably fixes bad stake behavior 2022-08-17 19:19:50 -07:00
BongaTheProto
b2b78d7db8 Merge branch 'Sandstorm-Station:master' into master 2022-08-17 01:27:55 -05:00
zeroisthebiggay
a600ea86b9 midround pr get trolled 2022-08-17 00:59:07 -04:00
TripleShades
d5b23752a1 wait while I'm here 2022-08-16 23:07:03 -04:00
TripleShades
e51b0da44b pain 2022-08-16 23:00:41 -04:00
Cognition
0c12f3f111 Removes persistence from glowing goo 2022-08-16 19:49:16 -06:00
Changelogs
dad40bdfee Automatic changelog compile [ci skip] 2022-08-17 00:57:31 +00:00
SandPoot
7fef29cbb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-16 21:14:05 -03:00
Changelogs
c3f5d71ca7 Automatic changelog compile [ci skip] 2022-08-16 23:09:34 +00:00
SPLURT Bot
cdfcfaade1 Automatic changelog generation for PR #433 [ci skip] 2022-08-16 23:08:10 +00:00
BongaTheProto
e061ac9fbf Merge pull request #433 from WoolyAypa/esthetic-help
More sprites for the sprite gods
2022-08-16 18:06:31 -05:00
Changelogs
f6299a4393 Automatic changelog compile [ci skip] 2022-08-16 23:06:12 +00:00
SPLURT Bot
60f6b62c11 Automatic changelog generation for PR #437 [ci skip] 2022-08-16 23:04:10 +00:00
BongaTheProto
4172885412 Merge pull request #437 from Yawet330/ihatematrixes
Wings^2, mental illness edition.
2022-08-16 18:02:37 -05: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
Yawet330
648ad713b0 Wings^2, mental illness edition. 2022-08-16 11:23:28 +01:00
Sandstorm Bot
864d0d3efd Automatic changelog compile [ci skip] 2022-08-16 06:26:02 +00:00
SandPoot
1e29739a34 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-16 03:23:37 -03:00
CitadelStationBot
02607e3b05 Automatic changelog generation for PR #15787 [ci skip] 2022-08-16 01:15:33 -05:00