PsiOmega 35ea424edc Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm

2015-08-29 10:06:18 +02:00

..

crates_lockers

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

2015-08-24 10:31:30 +02:00

stool_bed_chair_nest

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

2015-08-08 15:34:51 +02: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

…

curtains.dm

Fewer decal icon states, shower curtains.

2015-08-16 06:09:16 -07:00

displaycase.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

door_assembly.dm

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

2015-08-08 15:34:51 +02:00

electricchair.dm

…

extinguisher.dm

All the span-corrected dm files.

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

flora.dm

…

girders.dm

Merge pull request #10759 from mwerezak/girders

2015-08-24 17:28:08 +09:30

grille.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-13 08:40:31 +03:00

inflatable.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

janicart.dm

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

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

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

lattice.dm

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

mirror.dm

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

2015-08-22 03:11:53 +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

…

safe.dm

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

signs.dm

…

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

Splits species flags

2015-08-18 17:02:44 -04:00

watercloset.dm

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

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

windoor_assembly.dm

…

window_spawner.dm

Post-merge decal cleanup.

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

window.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00