Commit Graph

19859 Commits

Author SHA1 Message Date
Lin 2d439ffc71 Merge pull request #15209 from Putnam3145/more-ashwalker-woes
More ashwalker lung adjustments
2021-10-20 17:49:20 -07:00
Emily 57950045a7 Fixes the sprites for wielding. 2021-10-20 10:06:14 +02:00
Putnam3145 136ca1f107 Merge branch 'master' into more-ashwalker-woes 2021-10-18 04:35:57 -07:00
Putnam3145 34936ee5af Properly implements hysteresis 2021-10-18 03:44:40 -07:00
Putnam3145 b593774cc9 Merge pull request #15274 from keronshb/dynamicloneophijack
Removes Dynamic's ability to hijack loneop
2021-10-17 19:56:00 -07:00
Putnam3145 42da1e2079 Allows setting vents to siphon 2021-10-17 19:55:13 -07:00
SandPoot 8adf4606d7 closes #15279 2021-10-17 23:04:24 -03:00
SandPoot 45ef0fe5ca closes #15278 2021-10-17 21:40:39 -03:00
Hatterhat 9c45c41d4f ae 2021-10-16 18:27:59 -05:00
SandPoot 17986fea3f cannot escape 2021-10-16 14:24:22 -03:00
SandPoot 1561138350 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-16 14:11:00 -03:00
Hatterhat f1d5db7983 lol. lmao 2021-10-16 05:02:04 -05: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
keronshb daeaacd81c Removes Dynamic's ability to hijack loneop 2021-10-15 22:04:01 -04: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
silicons e99688242f Merge pull request #15266 from SandPoot/tiny-sized-fixes
Tiny sized fixes
2021-10-15 00:18:48 -07: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
silicons a8c5df2b4b Merge pull request #15263 from DeltaFire15/ping-time
Adds pinging to asay
2021-10-15 00:18:02 -07: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
WanderingFox95 75fee6ec25 applies requested changes 2021-10-13 22:25:15 +02:00
WanderingFox95 afbc34eea2 Hmm 2021-10-13 22:18:07 +02:00
WanderingFox95 6763324506 Fixes the BDM's proc loop (Ported from TG) 2021-10-13 21:47:24 +02:00
SandPoot 608b6fbb1b Upload files 2021-10-12 22:17:43 -03: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
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
SandPoot 829ca8b9a7 Merge branch 'master' into tgui-alerts-and-what-not 2021-10-11 20:41:56 -03: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
DeltaFire 5680b74294 safety 2021-10-11 20:32:00 +02:00
DeltaFire 66e81e7fda asay ping time 2021-10-11 19:52:30 +02:00
silicons 7c311f9730 Merge pull request #15251 from UncleBourbon/i-love-coding
Adds Neo-Kanji language to roundstart language and space ninja
2021-10-09 22:14:26 -07:00
keronshb 0e92551e51 Merge branch 'master' into pirate10k 2021-10-09 11:58:55 -04:00
Lin 2085279590 Merge pull request #15252 from SandPoot/tooltip-related-fixes
Tooltip related fixes
2021-10-08 22:31:23 -07:00
keronshb 1c754b814e Pirates pay raise documented 2021-10-09 00:47:16 -04:00
silicons a7fe6f0cfd Merge pull request #15255 from Hatterhat/saiga-fix
unsuperglues the warden's CCS stock
2021-10-08 20:57:30 -07:00
SandPoot 437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03:00
DeltaFire c5476daeec revert 2021-10-08 23:51:34 +02:00
keronshb e5f66413c8 fat dart
no idea what this even is
2021-10-08 17:28:25 -04:00
Hatterhat 20087a06a8 superglued stock 2021-10-08 00:15:35 -05:00
Putnam3145 3cfaad31c1 Merge pull request #15149 from keronshb/dynamicport
(Probably ready for test merge) DYNAMIC 2021
2021-10-07 18:14:59 -07:00
Lin b92226be17 Merge pull request #15245 from Putnam3145/fix-ashwalkers-one-last-time
Another lavaland breathing fix
2021-10-07 11:44:47 -07:00
Lin db0e331d45 Merge pull request #15225 from silicons/admin_ahelp_irc
ahelps now go to irc regardless of admin count
2021-10-07 11:40:33 -07:00
SandPoot f77ff24a6f Update tacklers.dm 2021-10-07 12:59:25 -03:00
SandPoot 3de08a74e7 Upload files 2021-10-07 12:32:20 -03:00
Cazz 9805224ede adds neo kanji language 2021-10-07 02:53:08 -05:00
keronshb 5451e5d4d7 Space Dragon gust no longer hardstuns. (#15243)
* Removes hardstun

* oops adds the disarm
2021-10-06 17:30:13 +02:00
Chayse Ramsay d1611ddf42 Lavaland ruin rad storm fix (#15242)
* Lavaland rad storm fix

* whoops

* double whoops

* Update Lavaland.dmm
2021-10-06 17:28:29 +02:00
Tupinambis 383f4423ac Why can't xenos eat rats and stuff. This fixes that. (#15227) 2021-10-06 17:19:59 +02:00