Commit Graph

45069 Commits

Author SHA1 Message Date
keronshb
02eb4685a9 Some adjustments 2021-10-28 23:44:02 -04:00
keronshb
ccb65156ac Adjustments and fixes 2021-10-26 12:53:50 -04:00
keronshb
50986b279e Requirement rework 2021-10-25 21:14:25 -04:00
keronshb
6c56f6f0ad Merge remote-tracking branch 'upstream/master' 2021-10-18 18:11:32 -04:00
Lin
1f7e65ad01 Merge pull request #15271 from Citadel-Station-13/admin_tickets
fixes "answered by <admin>" spam in irc
2021-10-15 23:34:15 -07:00
Changelogs
84a94cb8ce Automatic changelog compile [ci skip] 2021-10-16 00:28:46 +00:00
CitadelStationBot
bac8031057 Automatic changelog generation for PR #15268 [ci skip] 2021-10-15 02:19:29 -05:00
silicons
e6e0341cd8 Merge pull request #15268 from WanderingFox95/WanderingFox95-BDMFix
Removes the proc loop from the BDM's AI.
2021-10-15 00:19:26 -07:00
CitadelStationBot
1adfab6ec5 Automatic changelog generation for PR #15267 [ci skip] 2021-10-15 02:19:09 -05:00
silicons
c93fd1b486 Merge pull request #15267 from SandPoot/okay-cool-dynamic,-please-do-not-shove-it-down-my-throat
Removes hardcoded dynamic
2021-10-15 00:19:06 -07:00
CitadelStationBot
10b069ad67 Automatic changelog generation for PR #15266 [ci skip] 2021-10-15 02:18:52 -05:00
silicons
e99688242f Merge pull request #15266 from SandPoot/tiny-sized-fixes
Tiny sized fixes
2021-10-15 00:18:48 -07:00
CitadelStationBot
8fb4509fbc Automatic changelog generation for PR #15256 [ci skip] 2021-10-15 02:18:42 -05:00
silicons
d17419ed54 Merge pull request #15256 from keronshb/fatdart
no idea what this thing even is but he's chuffin back a fat dart and that's all that matters
2021-10-15 00:18:39 -07:00
CitadelStationBot
52dc17e2fd Automatic changelog generation for PR #15262 [ci skip] 2021-10-15 02:18:23 -05:00
silicons
c449bfcdf6 Merge pull request #15262 from dapnee/pubbyonceagain
Moves Pubby Court and Adds the BEPIS to Science
2021-10-15 00:18:19 -07:00
CitadelStationBot
6f08bc98b8 Automatic changelog generation for PR #15263 [ci skip] 2021-10-15 02:18:05 -05:00
silicons
a8c5df2b4b Merge pull request #15263 from DeltaFire15/ping-time
Adds pinging to asay
2021-10-15 00:18:02 -07:00
CitadelStationBot
97094619a0 Automatic changelog generation for PR #15253 [ci skip] 2021-10-15 02:17:53 -05:00
silicons
cca9efebd4 Merge pull request #15253 from SandPoot/tackler-gloves-no-spam-and-only-worn
Tackler gloves only work being worn
2021-10-15 00:17:49 -07:00
silicons
d0eade8fe1 fix 2021-10-14 19:20:32 -07:00
Changelogs
89fa46c116 Automatic changelog compile [ci skip] 2021-10-15 00:27:22 +00:00
Changelogs
b5e20ad231 Automatic changelog compile [ci skip] 2021-10-14 00:25:35 +00:00
SandPoot
bdd0cee2eb Update ticker.dm
shhhh
2021-10-13 19:12:23 -03:00
WanderingFox95
75fee6ec25 applies requested changes 2021-10-13 22:25:15 +02:00
WanderingFox95
afbc34eea2 Hmm 2021-10-13 22:18:07 +02:00
SandPoot
39a7449625 Update ticker.dm 2021-10-13 16:57:00 -03:00
SandPoot
4d7e1b32db Update ticker.dm 2021-10-13 16:49:44 -03:00
WanderingFox95
6763324506 Fixes the BDM's proc loop (Ported from TG) 2021-10-13 21:47:24 +02:00
WanderingFox95
a2b42d1b69 Merge branch 'Citadel-Station-13:master' into master 2021-10-13 21:37:14 +02:00
SandPoot
f03b83e89b Update server.txt 2021-10-13 15:12:52 -03:00
SandPoot
5153dba0f2 Upload files 2021-10-13 15:11:25 -03:00
SandPoot
608b6fbb1b Upload files 2021-10-12 22:17:43 -03:00
Changelogs
7dd50272e2 Automatic changelog compile [ci skip] 2021-10-13 00:26:56 +00:00
CitadelStationBot
ac67c4e75c Automatic changelog generation for PR #15261 [ci skip] 2021-10-12 01:56:59 -05:00
Lin
4be484f101 Merge pull request #15261 from MrJWhit/delta
Throwing trash in delta
2021-10-11 23:56:57 -07:00
CitadelStationBot
812a144db2 Automatic changelog generation for PR #15260 [ci skip] 2021-10-12 01:49:58 -05:00
Lin
fcd488b522 Merge pull request #15260 from MrJWhit/boxstation-stuff
Putting Trash and Fire to a box
2021-10-11 23:49:55 -07:00
silicons
f623d6e7eb Merge pull request #15229 from Hatterhat/perhaps-i-was-a-bit-too-harsh
vareditable clip reloading delay for shotguns
2021-10-11 20:46:06 -07:00
CitadelStationBot
789bbbdeb0 Automatic changelog generation for PR #15223 [ci skip] 2021-10-11 22:45:45 -05:00
silicons
91e7cb293c Merge pull request #15223 from Hatterhat/yeehaw-box
The Yeehaw Update - makes .38 lever-actions slightly more accessible
2021-10-11 20:45:42 -07:00
Putnam3145
b6fdf671f1 Merge pull request #15215 from silicons/afk_tracking
fixes afk detection
2021-10-11 15:52:03 -07:00
Putnam3145
3209917830 Merge pull request #15173 from silicons/vpn_block
adds PANIC_BUNKER_LIVING_VPN option (READ, THIS IS NOT A VPN BAN)
2021-10-11 15:51:52 -07:00
Putnam3145
83ebebaa05 Merge pull request #14890 from Citadel-Station-13/silicons-patch-44
[experimental] changes to slowdown scaling
2021-10-11 15:51:33 -07:00
silicons
f3e7929cb4 Merge pull request #15230 from Putnam3145/auxmos-update
Updates auxmos to latest
2021-10-11 15:50:03 -07:00
DeltaFire
5680b74294 safety 2021-10-11 20:32:00 +02:00
DeltaFire
66e81e7fda asay ping time 2021-10-11 19:52:30 +02:00
Changelogs
41b9ef2180 Automatic changelog compile [ci skip] 2021-10-11 00:28:25 +00:00
dapnee
24ce9d4de7 oopsy missed a brig wall near maint
aaaa
2021-10-10 17:42:37 -06:00
dapnee
de678585f0 Moves Pubby Court and Adds the BEPIS to Science
Moved courtroom, it's now adjacent to security. This means the monastery power/air supply room got moved back to where it was. While moving around the courtroom, interrogation got moved slightly higher up and now sec/cap's maintenance has a supply-ish room for repairs.

Also BEPIS
2021-10-10 17:29:14 -06:00