Commit Graph

19770 Commits

Author SHA1 Message Date
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
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 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
Lin 2085279590 Merge pull request #15252 from SandPoot/tooltip-related-fixes
Tooltip related fixes
2021-10-08 22:31:23 -07: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
DeltaFire c5476daeec revert 2021-10-08 23:51:34 +02: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 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
Chayse Ramsay 76fa85e683 Cyborg module sorting fixed (#15241) 2021-10-06 17:16:10 +02:00
Lin 3f50e836cc Merge pull request #15238 from DeltaFire15/nanitedefibs
Nanite defibs now heal oxygen damage akin to defibs, also adds the revival memory policy to them
2021-10-05 16:25:59 -07:00
Lin 8f9a2b6d0c Merge pull request #15235 from silicons/pai_radio_Stuff
redoes how pai emp silencing works
2021-10-05 12:32:23 -07:00
Lin 88db62f03f Merge pull request #15239 from jakeramsay007/7.12x82mm-Fix
7.12x82mm Match Ammo box sprite fixed
2021-10-05 12:21:10 -07:00
Lin b18fbe695a Merge pull request #15233 from SandPoot/misc-fixes
Some random fixes
2021-10-05 10:27:19 -07:00
Putnam3145 51f85c58a4 One last ashwalker fix 2021-10-04 20:56:08 -07:00
Chayse Ramsay 4d2e81d73c newline 2021-10-05 02:52:50 +01:00
Chayse Ramsay 6f0722ab48 Ammo box sprite fixed 2021-10-04 18:36:17 +01:00
DeltaFire 97eb42b35b defib policy hook & oxyheal 2021-10-04 15:49:12 +02:00
silicons bac7bc3fb6 fix 2021-10-03 11:29:32 -07:00
silicons f024318810 Merge pull request #14958 from WanderingFox95/WanderingFox95-TribalOverhaul
Tribal Crafting Overhauled & Expanded
2021-10-03 11:20:55 -07:00
silicons 31467420d7 Merge pull request #15221 from SandPoot/colormate
Colormate tgui + minor tgui updates
2021-10-03 08:51:51 -07:00
SandPoot 95b814d47e Upload files 2021-10-02 22:29:01 -03:00
WanderingFox95 83987db48a Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-10-01 18:51:46 +02:00
Hatterhat 02abdd4eef oh i forgot to commit this before i made the pr 2021-09-30 23:22:45 -05:00
Hatterhat 87e1b80000 adds vareditable clip delay 2021-09-30 23:16:19 -05:00
Hatterhat 1d005db9a8 THE YEEHAW UPDATE 2021-09-30 23:10:33 -05:00
keronshb deaab16e55 Ninja hijack in dynamic 2021-09-30 23:49:51 -04:00
Putnam3145 826ccbe40c Merge pull request #15214 from qweq12yt/grab-bag-bug-fixing
[Fix] Grab bag bug fixing
2021-09-29 18:56:17 -07:00
silicons 0a75925df9 wack 2021-09-29 06:02:17 -07:00
SandPoot b23b88524d Upload files 2021-09-28 22:03:17 -03:00
silicons 770942e35d Merge pull request #15199 from zeroisthebiggay/patch-26
removes motivation player lock; halves the motivation's price; allows motivation to discount.
2021-09-28 00:17:23 -07:00
silicons 5ff4a2ace5 Merge pull request #15180 from LetterN/achives-
Achivement & Clowncar update
2021-09-28 00:15:52 -07:00
silicons cd579124cb Merge pull request #15188 from buffyuwu/clothingupdate1
ports/adds more edited clothing
2021-09-28 00:15:23 -07:00
silicons f317e510f7 Merge pull request #15191 from keronshb/ninjaadjustment
Puts the ninja status back into the status window and restores the energy charge meter.
2021-09-28 00:14:42 -07:00
silicons d6e7a096e6 Merge pull request #15206 from zeroisthebiggay/metaprison
meta station prison remapping
2021-09-28 00:13:13 -07:00
silicons b7476491d3 Merge pull request #15204 from Hatterhat/clip-delay
shotgun shell clips now have melee click delay (0.8s) with this one weird trick
2021-09-28 00:13:02 -07:00
silicons dd6e2d7240 Merge pull request #15202 from Hatterhat/saiga-ballin
CCS stock safety
2021-09-28 00:12:54 -07:00
silicons cefef5b0bc Merge pull request #15203 from zeroisthebiggay/buggers
Fixing (cult) slurring and stuttering never going away from non-carbon mobs.
2021-09-27 23:31:03 -07:00
silicons 0ec7e92f82 that too 2021-09-27 17:44:14 -07:00
silicons b064d73b95 that too 2021-09-27 17:43:42 -07:00
silicons 697ea7ad93 fix 2021-09-27 17:40:53 -07:00