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

..

backpack.dm

TG_Port_2

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

bags.dm

Adds variables for CentComm, NanoTrasen and the station name.

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

belt.dm

The detective colt can now be reskinned

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

bible.dm

Makes beer and ale bottles into actual bottles, adjusts bottle smashing

2015-08-13 18:37:13 -04:00

boxes.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

briefcase.dm

Entirely removes briefcase instastun and pointless New() definition

2015-06-05 09:00:19 +01:00

fancy.dm

Name change

2015-10-01 13:35:26 -05:00

firstaid.dm

…

internal.dm

Mob size tweaks.

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

lockbox.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

misc.dm

Fix cables and windows; sleepers, cryopods and donut boxes will now rotate correctly with client.dir

2015-08-18 13:43:11 +01:00

secure.dm

Briefcase Fix

2015-09-30 17:10:57 -05:00

storage.dm

Amendments to light replacer and janitor supply crate

2015-10-06 19:59:56 +02:00

toolbox.dm

…

uplink_kits.dm

Update uplink_kits.dm

2015-06-21 16:21:51 -05:00

wallets.dm

…