SinTwo a2b24d64b7 TG_Port_2 ...

Conflicts:
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preferences_gear.dm
	code/modules/clothing/under/accessories/accessory.dm

2015-10-11 00:36:13 -04:00

..

devices

Two minor edits to ERT equipment

2015-10-11 00:30:10 -04:00

robot

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-09-05 09:35:02 +02:00

stacks

Floor painter, turf, and decal tweaks.

2015-09-21 15:14:13 +02:00

weapons

TG_Port_2

2015-10-11 00:36:13 -04:00

apc_frame.dm

…

blueprints.dm

Adds variables for CentComm, NanoTrasen and the station name.

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

bodybag.dm

Mob size tweaks.

2015-09-20 17:12:07 +02:00

contraband.dm

…

crayons.dm

…

glassjar.dm

…

latexballoon.dm

…

paintkit.dm

Added get_bodytype() species proc as groundwork for subspecies.

2015-08-22 02:53:16 +09:30

shooting_range.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-30 10:49:37 +02:00

toys.dm

Merge pull request #10340 from comma/russian_roulette

2015-09-03 19:40:01 +02:00

trash.dm

…