Commit Graph

27072 Commits

Author SHA1 Message Date
SmArtKar
015bd0b145 reeee 2021-02-17 17:16:52 +03:00
SmArtKar
eae7e36b95 E 2021-02-17 17:16:33 +03:00
SmArtKar
0b3b1cef7a Small QoL changes to TCG 2021-02-17 17:07:15 +03:00
Putnam3145
74e6f9198b Merge pull request #14236 from dzahlus/toxic-objective-removal
Removes prevent from leaving alive, maroon objective
2021-02-17 05:35:27 -08:00
silicons
e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
2021-02-17 01:30:13 -07:00
SmArtKar
3e95e28f85 Illegal cards will now permanently be marked, not for just one round 2021-02-16 20:05:59 +03:00
SmArtKar
598c19996c Oopsie 2021-02-16 19:53:27 +03:00
SmArtKar
e4afe49687 Adds card crafting!" 2021-02-16 19:38:48 +03:00
SmArtKar
664f81585b Adds undef 2021-02-16 19:11:04 +03:00
SmArtKar
0e1e3aaaed and more 2021-02-16 18:57:43 +03:00
SmArtKar
799917bc70 and more 2021-02-16 16:24:37 +03:00
SmArtKar
8abce43547 Fixes 2021-02-16 16:04:31 +03:00
SmArtKar
3da4c73fbe Slight changes to balance, new cards 2021-02-16 15:57:05 +03:00
SmArtKar
cf76b9d740 Fixes card saving, fixes some icons, adds rulebook 2021-02-16 12:12:20 +03:00
Lin
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
Lin
cef0226b0b Merge pull request #14244 from silicons/botany_logging
streamlining botany logging, adds english_list_assoc
2021-02-15 14:22:36 -06:00
SmArtKar
2b46d87742 Packs now put cards into your hand 2021-02-15 21:15:08 +03:00
SmArtKar
3ba4a9d670 FUCKING FINALLY 2021-02-15 21:02:54 +03:00
SmArtKar
924cfd1007 i hate this PR 2021-02-15 20:25:27 +03:00
SmArtKar
c89a3c073a reeeee 2021-02-15 20:19:43 +03:00
SmArtKar
893f5b42e7 I hate trigonometry so here you go, propper formula for card rotation 2021-02-15 20:10:17 +03:00
SmArtKar
375a6891bf Adds new nuclear cards 2021-02-15 19:44:47 +03:00
Lin
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
Lin
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
Lin
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
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
silicons
43174501de final tweaks 2021-02-13 20:47:38 -07:00
silicons
60030b6c68 final tweaks 2021-02-13 20:46:40 -07: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
silicons
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
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
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
silicons
0aea43afcc Merge pull request #14224 from DeltaFire15/no-more-YELLING
Makes clockies yell less
2021-02-13 19:06:57 -07:00
silicons
5990a3ad4b Merge pull request #14227 from Adelphon/polycloth
CLOAK, PARKA, COLORFUL SHOES
2021-02-13 19:06:46 -07:00
silicons
aeb9b1e06c Merge pull request #14233 from DeltaFire15/armwrap-kneecap
About unarmed parrying..
2021-02-13 19:06:39 -07:00
silicons
3b441bfd28 kay 2021-02-13 19:03:27 -07:00
silicons
77f4e08727 AAAAAAAAA 2021-02-13 18:57:30 -07:00
Lin
98736a7a37 Merge pull request #14207 from TyrianTyrell/master
Multilingual fix? (Has since been tested.)
2021-02-13 16:41:10 -06:00
silicons
66570144b9 Update subsystems.dm 2021-02-12 23:15:36 -07:00
silicons
110b4981dd Update subsystems.dm 2021-02-12 23:13:33 -07:00
silicons
f6cb489e73 Update subsystems.dm 2021-02-12 23:03:08 -07:00