6 Commits

Author	SHA1	Message	Date
Tigercat2000	288af9f92c	Revert "Merge pull request #4739 from monster860/vg-parallax" ... This reverts commit 451c934379, reversing changes made to 64f26d999f. Conflicts: SQL/paradise_schema.sql SQL/paradise_schema_prefixed.sql	2016-07-28 15:48:27 -07:00
monster860	b2cb87edc9	Merge branch 'master' into vg-parallax	2016-07-28 16:45:10 -04:00
monster860	94c1a4e08e	Merge branch 'master' into vg-parallax	2016-07-08 14:51:30 -04:00
Tigercat2000	71e5344a98	Mass replace	2016-07-07 19:34:02 -07:00
Tigercat2000	d5ae124a92	Merge remote-tracking branch 'upstream/master' into bay_equipping ... Conflicts: code/modules/client/preference/preferences.dm icons/mob/uniform.dmi	2016-06-13 20:11:29 -07:00
Tigercat2000	e91bd14fc6	Bay/Polaris loadouts ... Basics - Allows you to select up to 10 items in the character menu - Saved per-character - The items will be spawned when you join - Some items may have job limitations Included Items - Accessories - Scarf - Black Scarf - Christmas Scarf - Dark Blue Scarf - Green Scarf - Light Blue Scarf - Orange Scarf - Purple Scarf - Red Scarf - Striped Blue Scarf - Striped Green Scarf - Striped Red Scarf - White Scarf - Yellow Scarf - Zebra Scarf - Cosmetics - Blue lipstick - Jade lipstick - Purple lipstick - Red lipstick - General - d20 - Uniforms and Casual Dress - Blue Plaid Skirt - Purple Plaid Skirt - Red Plaid Skirt - Atmospherics Skirt - Black Skirt - Cargo Skirt - Chemist Skirt - CMO Skirt - Engineer Skirt - HOS Skirt - Medical Skirt - QM Skirt - Roboticist Skirt - Scientist Skirt - Security Skirt - Virologist Skirt - Warden Skirt	2016-05-11 13:00:23 -07:00