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

Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi

2015-08-11 00:51:18 +02:00

..

crates_lockers

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

2015-08-11 00:51:18 +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

…

bedsheet_bin.dm

…

coathanger.dm

Debugging!

2015-05-12 21:30:06 +09:30

curtains.dm

…

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 remote-tracking branch 'upstream/dev-freeze' into dev

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

grille.dm

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

2015-07-30 10:49:37 +02: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

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

2015-06-26 20:28:47 +02:00

mirror.dm

Uses raised TM symbol in the mirror name.

2015-08-04 10:41:28 +02:00

mop_bucket.dm

All the span-corrected dm files.

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

morgue.dm

Merge pull request #10442 from Baystation12/dev-freeze

2015-08-07 10:37:47 +02:00

musician.dm

objects/effects, objects/structures

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

noticeboard.dm

Fixes #9076

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

safe.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02: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

…

watercloset.dm

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

2015-07-12 15:14:43 +02:00

windoor_assembly.dm

objects/effects, objects/structures

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

window.dm

Ports /tg/'s meteor implementation.

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