 SandPoot
|
2e29f30fdf
|
Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing
|
2021-02-18 15:04:22 -03:00 |
|
|
SandPoot
|
cf2e70671a
|
upload files
|
2021-02-18 14:47:10 -03:00 |
|
|
SmArtKar
|
689293428b
|
Update code/modules/tcg/cards.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
|
2021-02-18 17:44:38 +03:00 |
|
|
SmArtKar
|
5e8209a6e9
|
Update code/modules/tcg/cards.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
|
2021-02-18 17:44:33 +03:00 |
|
|
SmArtKar
|
21012bf94e
|
oof
|
2021-02-18 14:39:56 +03:00 |
|
|
SmArtKar
|
b2b7b4ca9a
|
Fucking finally
|
2021-02-18 14:17:43 +03:00 |
|
|
Lin
|
8bf3706876
|
Merge pull request #14249 from Putnam3145/buzz-fuzz-fix
Set buzz fuzz's addiction threshold to fit the comment
|
2021-02-18 00:11:13 -06:00 |
|
|
Lin
|
b0c4fa5755
|
Merge pull request #14259 from timothyteakettle/log-pierced-reality-examine
staring into pierced realities is now logged
|
2021-02-18 00:01:32 -06:00 |
|
|
Hatterhat
|
6d28c27f36
|
aoaoaoaooaoa
|
2021-02-17 23:24:44 -06:00 |
|
|
Lin
|
460042bc33
|
Merge pull request #14248 from shellspeed1/trying-to-make-floor-bots-actually-do-a-decent-job-of-repairs
Fix for floorbots not placing a plate before placing a floor.
|
2021-02-17 17:28:03 -06:00 |
|
|
Lin
|
a27e4ba9e9
|
Merge pull request #14252 from silicons/pet_peeve
spellchecks priviledge --> privilege
|
2021-02-17 16:57:01 -06:00 |
|
|
Dan-Neposh
|
2ec2f55eb7
|
updates fork
|
2021-02-17 12:03:28 -05:00 |
|
|
SmArtKar
|
fecf879b0c
|
Fixed
|
2021-02-17 18:54:59 +03:00 |
|
|
SmArtKar
|
756be084bc
|
Decks are saveable!
|
2021-02-17 18:50:23 +03:00 |
|
|
Dan-Neposh
|
ace2512812
|
solves run linter errors
|
2021-02-17 10:24:37 -05:00 |
|
|
Putnam3145
|
d1a6fa972f
|
Merge pull request #14254 from BlueWildrose/holodick
Messages admins of certain holodeck actions
|
2021-02-17 07:21:41 -08:00 |
|
|
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 |
|
|
shellspeed1
|
303d35074d
|
Another fix for infinite floor tiles
|
2021-02-16 20:24:50 -08:00 |
|
|
Timothy Teakettle
|
e50073e636
|
Update eldritch_effects.dm
|
2021-02-16 20:54:37 +00: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 |
|
|
The0bserver
|
f6721d02b3
|
Adds chemicals I missed on the first pass.
|
2021-02-16 09:53:09 -05:00 |
|
|
IronEleven
|
7ff8b41874
|
Update spacevine.dm
|
2021-02-16 09:14:27 -05: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 |
|
|
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 |
|
|
Adelphon
|
4c6685333b
|
Polychromic Pants & Jacket
|
2021-02-16 05:24:45 -05:00 |
|
|
SmArtKar
|
cf76b9d740
|
Fixes card saving, fixes some icons, adds rulebook
|
2021-02-16 12:12:20 +03:00 |
|
|
TyrianTyrell
|
6f25b65290
|
Apply suggestions from code review
Let's see if it will?
Co-authored-by: Lin <linzolle@gmail.com>
|
2021-02-16 03:24:27 -05:00 |
|
|
Blue Wildrose
|
99a1991e0a
|
Messages admins of certain holodeck actions
|
2021-02-15 19:55:05 -07:00 |
|
|
keronshb
|
d87ac38e58
|
Eutactic Blade Restoration + Hyperblade
Brings the Eutatic Blade back to the traitor uplink, same for the Hyperblade.
|
2021-02-15 21:36:47 -05:00 |
|
|
silicons
|
3cac44b2f0
|
a
|
2021-02-15 19:35:16 -07:00 |
|
|
Chiirno
|
8257283cef
|
Update code/modules/reagents/chemistry/reagents/medicine_reagents.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
|
2021-02-15 22:03:12 -04: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 |
|
|
Chiirno
|
8ea8f4e7e9
|
just a little tweak
|
2021-02-15 18:31:07 -04:00 |
|
|
TyrianTyrell
|
915b911a40
|
Update say.dm
|
2021-02-15 17:15:30 -05: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 |
|