PsiOmegaDelta 34fdc4712e Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm

2015-07-14 08:21:12 +02:00

..

crates_lockers

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

2015-07-14 08:21:12 +02:00

stool_bed_chair_nest

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

2015-06-22 16:59:19 +02:00

barsign.dm

…

bedsheet_bin.dm

…

coathanger.dm

Debugging!

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

curtains.dm

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

2015-05-11 09:28:59 +02: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' into span_class=notice

2015-06-02 17:33:20 +01:00

electricchair.dm

…

extinguisher.dm

All the span-corrected dm files.

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

flora.dm

…

girders.dm

All the span-corrected dm files.

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

grille.dm

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

2015-06-24 18:15:28 +02:00

inflatable.dm

Ports /tg/'s meteor implementation.

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

janicart.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +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

All the span-corrected dm files.

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

mop_bucket.dm

All the span-corrected dm files.

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

morgue.dm

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

2015-07-14 08:21:12 +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

Fixes #9581

2015-05-31 03:34:29 +09:30

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