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
Timothy Teakettle
11df2bb77c
fixes emps not working on lockers ( #15259 )
...
* Update closets.dm
* Update code/game/objects/structures/crates_lockers/closets.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2021-10-11 00:48:00 +02:00
silicons
84c6970c27
Merge pull request #15250 from SandPoot/you-are-now-rate-limited
...
You are now rate limited
2021-10-09 22:14:45 -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
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
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
keronshb
5c562959a9
Allows midround budget to be spent in extended
2021-10-07 14:12:37 -04: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
Putnam3145
fedf409a5d
Merge pull request #15105 from Citadel-Station-13/silicons-patch-7
...
comedically controversial stunbaton """"buff""""
2021-10-07 00:05:45 -07:00
Putnam3145
8be5dba86a
Merge pull request #15127 from Citadel-Station-13/silicons-patch-14
...
chaplain runspeed holy weapon will now only give a random slowdown/speedup of 6 tiles which for the most part ignores all other slowdowns/speedups, instead of randomizing between slowing to a crawl and running faster than the speed of light
2021-10-07 00:05:24 -07:00
Putnam3145
ac84eed0d1
Merge pull request #15129 from Citadel-Station-13/silicons-patch-15
...
if you recognize this is not the way to do it, don't do it (bandaid to polychromatic loadout lookup)
2021-10-07 00:05:06 -07:00
SandPoot
e88368cd4c
Update fail2topic.dm
2021-10-06 16:27:06 -03: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
Putnam3145
8070df6492
whoops
2021-10-05 19:07:52 -07: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
SandPoot
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03: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
1b8c72285f
Merge pull request #15236 from silicons/decon
...
fixes computer boards disappearing on decon
2021-10-05 12:14:00 -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
SandPoot
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03: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
DeltaFire
cd570be827
woo
2021-10-04 15:03:56 +02:00
silicons
f5e52f810d
I HATE YOU
2021-10-03 13:54:58 -07:00
silicons
715251dea1
wack
2021-10-03 13:25:30 -07: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
1c80169f22
Update shields.dm
2021-10-02 22:35:54 -03: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
keronshb
deaab16e55
Ninja hijack in dynamic
2021-09-30 23:49:51 -04:00
keronshb
65d2bf3d33
Better round end report
2021-09-30 19:00:00 -04:00
keronshb
4e91dde6b0
Timer fix and dead list removal
2021-09-30 14:50:04 -04:00
