SinTwo ec58f7c705 TG_Port ...

Conflicts:
	code/game/objects/items/devices/radio/headset.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/modules/clothing/head/helmet.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/clothing/under/accessories/accessory.dm
	code/modules/mob/new_player/sprite_accessories.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/mask.dmi
	icons/obj/clothing/hats.dmi
	polaris.dme

2015-10-11 00:58:26 -04:00

..

colour.dm

Removes most instances of item_color

2015-04-22 17:40:27 -04:00

jobs.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

magboots.dm

Changes .loc= to .forcemove in magboots.dm, rig.dm, and void.dm.

2015-08-25 09:58:44 -04:00

miscellaneous.dm

TG_Port

2015-10-11 00:58:26 -04:00