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

..

crates_lockers

TG_Port_2

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

stool_bed_chair_nest

Updates blob

2015-10-05 18:10:16 +03:00

barsign.dm

Barsigns now rotate correctly with client.dir, improved the code a bit

2015-08-18 07:18:13 +01:00

bedsheet_bin.dm

Allows bedsheets to be cut up into rags

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

coathanger.dm

Resprites, renames, and repaths the detective uniforms.

2015-08-22 19:43:28 -05:00

curtains.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

displaycase.dm

Updates blob

2015-10-05 18:10:16 +03:00

door_assembly.dm

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

2015-08-23 01:30:46 -04:00

electricchair.dm

…

extinguisher.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

flora.dm

…

girders.dm

Updates blob

2015-10-05 18:10:16 +03:00

grille.dm

Updates blob

2015-10-05 18:10:16 +03:00

inflatable.dm

Updates blob

2015-10-05 18:10:16 +03:00

janicart.dm

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

2015-07-24 10:53:57 +02:00

kitchen_spike.dm

Mob size tweaks.

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

lamarr_cage.dm

Updates blob

2015-10-05 18:10:16 +03:00

lattice.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

mirror.dm

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

mop_bucket.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

morgue.dm

Merge branch 'dev' into ofSleepersAndNano

2015-08-13 09:20:51 +03:00

musician.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

noticeboard.dm

Fixes #9076

2015-05-30 05:24:44 +09:30

safe.dm

Updates blob

2015-10-05 18:10:16 +03:00

signs.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

simple_doors.dm

Adds common proc to obtain the material of an object

2015-08-01 23:03:21 -04:00

tank_dispenser.dm

…

target_stake.dm

…

transit_tubes.dm

…

under_wardrobe.dm

Adds socks.

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

watercloset.dm

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

2015-08-25 08:20:13 +02:00

windoor_assembly.dm

objects/effects, objects/structures

2015-05-30 14:37:40 +01:00

window_spawner.dm

Post-merge decal cleanup.

2015-08-18 12:33:49 +02:00

window.dm

Updates blob

2015-10-05 18:10:16 +03:00