Arokha Sieyes d998f36c38 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018 ...

# Conflicts:
#	code/game/objects/structures/signs.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/organs/organ_icon.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme

2017-12-26 23:07:58 -05:00

..

cah_black_cards.dm

Adds 500 Cards against The Galaxy cards

2017-03-29 12:52:20 -04:00

cah_white_cards.dm

Adds 500 Cards against The Galaxy cards

2017-03-29 12:52:20 -04:00

cah.dm

…

cardemon.dm

Playing card improvement - Take two (#4140)

2017-10-25 12:20:20 -05:00

cards.dm

You can now remove card decks from containers. (#4452)

2017-12-22 19:33:13 -06:00

dice.dm

Changelog, adds the dicecup to the loadout

2017-04-17 12:44:34 -05:00

spaceball_cards.dm

Playing card improvement - Take two (#4140)

2017-10-25 12:20:20 -05:00

tarot.dm

Playing card improvement - Take two (#4140)

2017-10-25 12:20:20 -05:00