The0bserver
|
3f88079d6f
|
Merge remote-tracking branch 'Upstream/master'
|
2021-02-14 07:01:13 -05:00 |
|
CitadelStationBot
|
91bb195249
|
Automatic changelog generation for PR #14140 [ci skip]
|
2021-02-13 23:30:16 -06:00 |
|
Lin
|
7576c25666
|
Merge pull request #14140 from silicons/tgui_fix
fixes chat highlighting not working (literally) half the time
|
2021-02-13 23:30:14 -06:00 |
|
CitadelStationBot
|
6855d5d57a
|
Automatic changelog generation for PR #14096 [ci skip]
|
2021-02-13 23:30:03 -06:00 |
|
Lin
|
62fe42513b
|
Merge pull request #14096 from Citadel-Station-13/silicons-patch-27
makes people on the ground punch less hard. completely removes punch rng miss.
|
2021-02-13 23:30:00 -06:00 |
|
Lin
|
8a076571dd
|
Merge pull request #14243 from silicons/virus_logging
logging defaults to on instead of off, patches a few holes
|
2021-02-13 22:56:19 -06:00 |
|
Lin
|
b42ca71b00
|
Merge branch 'master' into virus_logging
|
2021-02-13 21:20:09 -06:00 |
|
Lin
|
32770ed0d3
|
Merge pull request #14241 from silicons/logging
fixes href logging prefiltering of chat pings, removes extraneous newlines from verbose tgui logging
|
2021-02-13 21:17:37 -06:00 |
|
silicons
|
61ab2a5a53
|
logging fixes
|
2021-02-13 19:47:17 -07:00 |
|
CitadelStationBot
|
074a4c1800
|
Automatic changelog generation for PR #14224 [ci skip]
|
2021-02-13 20:06:59 -06:00 |
|
silicons
|
0aea43afcc
|
Merge pull request #14224 from DeltaFire15/no-more-YELLING
Makes clockies yell less
|
2021-02-13 19:06:57 -07:00 |
|
CitadelStationBot
|
f52e0e2152
|
Automatic changelog generation for PR #14227 [ci skip]
|
2021-02-13 20:06:48 -06:00 |
|
silicons
|
5990a3ad4b
|
Merge pull request #14227 from Adelphon/polycloth
CLOAK, PARKA, COLORFUL SHOES
|
2021-02-13 19:06:46 -07:00 |
|
CitadelStationBot
|
d7fb8c64c6
|
Automatic changelog generation for PR #14233 [ci skip]
|
2021-02-13 20:06:41 -06:00 |
|
silicons
|
aeb9b1e06c
|
Merge pull request #14233 from DeltaFire15/armwrap-kneecap
About unarmed parrying..
|
2021-02-13 19:06:39 -07:00 |
|
CitadelStationBot
|
c186a5c1c8
|
Automatic changelog generation for PR #14192 [ci skip]
|
2021-02-13 20:05:58 -06:00 |
|
silicons
|
552a7c373e
|
Merge pull request #14192 from dzahlus/cm13-pain-emote
Ports *pain emote from CM13
|
2021-02-13 19:05:56 -07:00 |
|
silicons
|
3b441bfd28
|
kay
|
2021-02-13 19:03:27 -07:00 |
|
silicons
|
77f4e08727
|
AAAAAAAAA
|
2021-02-13 18:57:30 -07:00 |
|
Changelogs
|
4e1f3f7221
|
Automatic changelog compile [ci skip]
|
2021-02-14 00:14:33 +00:00 |
|
CitadelStationBot
|
8c4611fe2d
|
Automatic changelog generation for PR #14207 [ci skip]
|
2021-02-13 16:41:12 -06:00 |
|
Lin
|
98736a7a37
|
Merge pull request #14207 from TyrianTyrell/master
Multilingual fix? (Has since been tested.)
|
2021-02-13 16:41:10 -06:00 |
|
CitadelStationBot
|
0487d51631
|
Automatic changelog generation for PR #14231 [ci skip]
|
2021-02-12 20:00:17 -06:00 |
|
silicons
|
731c368ba7
|
Merge pull request #14231 from DeltaFire15/sigh
sigh
|
2021-02-12 19:00:14 -07:00 |
|
CitadelStationBot
|
5653a87317
|
Automatic changelog generation for PR #14232 [ci skip]
|
2021-02-12 20:00:10 -06:00 |
|
silicons
|
ae55071fe8
|
Merge pull request #14232 from DeltaFire15/better-be-named
Fixes & Improves some antagpanel stuff
|
2021-02-12 19:00:07 -07:00 |
|
CitadelStationBot
|
0e08620cc1
|
Automatic changelog generation for PR #14225 [ci skip]
|
2021-02-12 19:54:38 -06:00 |
|
silicons
|
76837ee0b6
|
Merge pull request #14225 from Hatterhat/dth-kit-pass2
[hello if someone could fight the maintainers to take a look that'd be great] fixes durathread armor kits
|
2021-02-12 18:54:36 -07:00 |
|
Changelogs
|
eff73114da
|
Automatic changelog compile [ci skip]
|
2021-02-13 00:15:04 +00:00 |
|
TyrianTyrell
|
a4bb96f614
|
Update good.dm
|
2021-02-12 07:02:14 -05:00 |
|
CitadelStationBot
|
891f00bc48
|
Automatic changelog generation for PR #14166 [ci skip]
|
2021-02-11 22:06:50 -06:00 |
|
DeltaFire
|
1ea3aafa10
|
Merge pull request #14166 from Hatterhat/ebola-nerf
energy bola nerf - reduced breakout time (6 sec -> 2.5), deletes on remove
|
2021-02-12 05:06:48 +01:00 |
|
DeltaFire
|
06101ee9c8
|
sigh
|
2021-02-12 03:30:15 +01:00 |
|
DeltaFire
|
b0ff405a13
|
cool
|
2021-02-12 03:06:53 +01:00 |
|
DeltaFire
|
fb4641b348
|
e
|
2021-02-12 02:42:59 +01:00 |
|
Hatterhat
|
7ec692ef60
|
this is good...isn't it?
|
2021-02-11 19:08:29 -06:00 |
|
CitadelStationBot
|
f9576c1fd1
|
Automatic changelog generation for PR #14223 [ci skip]
|
2021-02-11 19:02:47 -06:00 |
|
Lin
|
61877a3d1c
|
Merge pull request #14223 from timothyteakettle/quieten-a-log
changes a migration error to use log_game instead of message_admins
|
2021-02-11 19:02:44 -06:00 |
|
Changelogs
|
733a2509fe
|
Automatic changelog compile [ci skip]
|
2021-02-12 00:13:18 +00:00 |
|
DeltaFire
|
5afa573fa6
|
sigh
sigh
|
2021-02-12 00:50:42 +01:00 |
|
dzahlus
|
816ee5f61c
|
Merge branch 'master' into cm13-pain-emote
|
2021-02-11 23:42:42 +01:00 |
|
dzahlus
|
ccab5583a5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Citadel-Station-13-master
|
2021-02-11 23:41:28 +01:00 |
|
DeltaFire
|
456219003c
|
Merge pull request #14228 from silicons/tgui_recompile
TGUI recompile
|
2021-02-11 15:37:27 +01:00 |
|
dzahlus
|
a5f7718fe1
|
PLEASE I BEG YOU
|
2021-02-11 15:03:02 +01:00 |
|
silicons
|
423fcaa70a
|
tgui_recompile
|
2021-02-11 04:57:35 -07:00 |
|
silicons
|
8bdf0b98a8
|
Merge pull request #14213 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/marked-2.0.0
Bump marked from 1.1.1 to 2.0.0 in /tgui
|
2021-02-11 04:51:31 -07:00 |
|
Adelphon
|
919e23c122
|
More Clothes
|
2021-02-11 02:36:50 -05:00 |
|
Hatterhat
|
8103078ff1
|
second pass pt2
|
2021-02-11 00:29:25 -06:00 |
|
Hatterhat
|
3040eca4e0
|
holy shit what was i thinking god FUCK durathread
|
2021-02-11 00:20:49 -06:00 |
|
CitadelStationBot
|
251bf42d71
|
Automatic changelog generation for PR #14220 [ci skip]
|
2021-02-10 22:00:19 -06:00 |
|