Commit Graph
41389 Commits
Author SHA1 Message Date
Letter N 7b24456e2d does not exist 2021-02-16 20:33:46 +08:00
Letter N 3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
LinandGitHub 975c98731e Merge pull request #14242 from timothyteakettle/age-gate-2-electric-boogaloo
age gate 2 electric boogaloo
2021-02-15 18:16:44 -06:00
Changelogs 6ee8ae12c7 Automatic changelog compile [ci skip] 2021-02-16 00:14:28 +00:00
LinandGitHub cef0226b0b Merge pull request #14244 from silicons/botany_logging
streamlining botany logging, adds english_list_assoc
2021-02-15 14:22:36 -06:00
CitadelStationBot 013588b748 Automatic changelog generation for PR #14245 [ci skip] 2021-02-14 22:52:46 -06:00
LinandGitHub 142be853dc Merge pull request #14245 from silicons/sprint_staging
adds config entry for sprint removal that works prettier than just setting sprint speed to 0
2021-02-14 22:52:44 -06:00
Changelogs 52298a771d Automatic changelog compile [ci skip] 2021-02-15 00:13:29 +00:00
LinandGitHub 27e3e8de26 Merge pull request #14247 from timothyteakettle/another-dumb-href-exploit
[s] stops you purging sec records without being logged in
2021-02-14 17:05:43 -06:00
timothyteakettle 8f0fbb75ac Update security.dm 2021-02-14 22:21:11 +00:00
LinandGitHub 1d00bc51cb Merge pull request #14238 from Citadel-Station-13/silicons-patch-13
fixes linter errors with COMPILE_OVERLAYS (wow this is stupid)
2021-02-14 13:34:25 -06:00
Letter N 78ef87b012 minor fixes, compile but still bugged 2021-02-14 17:08:16 +08:00
CitadelStationBot 91bb195249 Automatic changelog generation for PR #14140 [ci skip] 2021-02-13 23:30:16 -06:00
LinandGitHub 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
LinandGitHub 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
LinandGitHub 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
Letter N b2c7b80cd2 Revert "icons should exist"
illegal git commits
2021-02-14 12:02:36 +08:00
silicons 43174501de final tweaks 2021-02-13 20:47:38 -07:00
silicons 60030b6c68 final tweaks 2021-02-13 20:46:40 -07:00
Letter N de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
silicons cc981cff7d fix 2021-02-13 20:38:41 -07:00
silicons 5217d0b306 fix 2021-02-13 20:37:09 -07:00
silicons bcd4ca9e67 fix 2021-02-13 20:34:47 -07:00
siliconsandGitHub d28411b4a3 Update _lists.dm 2021-02-13 20:31:34 -07:00
silicons d6a3c2d003 update 2021-02-13 20:30:44 -07:00
silicons 2ef33c5c88 sprint updates 2021-02-13 20:24:26 -07:00
LinandGitHub b42ca71b00 Merge branch 'master' into virus_logging 2021-02-13 21:20:09 -06:00
LinandGitHub 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 6941f2a183 woops 2021-02-13 20:01:48 -07:00
silicons 4a0adc49f6 mod 2021-02-13 20:00:28 -07:00
silicons 61ab2a5a53 logging fixes 2021-02-13 19:47:17 -07:00
timothyteakettle b2588c5d57 Update new_player.dm 2021-02-14 02:11:07 +00:00
CitadelStationBot 074a4c1800 Automatic changelog generation for PR #14224 [ci skip] 2021-02-13 20:06:59 -06:00
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
LinandGitHub 98736a7a37 Merge pull request #14207 from TyrianTyrell/master
Multilingual fix? (Has since been tested.)
2021-02-13 16:41:10 -06:00
Letter N 45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08:00
siliconsandGitHub 66570144b9 Update subsystems.dm 2021-02-12 23:15:36 -07:00
siliconsandGitHub 110b4981dd Update subsystems.dm 2021-02-12 23:13:33 -07:00
siliconsandGitHub f6cb489e73 Update subsystems.dm 2021-02-12 23:03:08 -07:00