PsiOmegaDelta 713a7bd654 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/devices/flashlight.dm

2015-08-25 08:12:39 +02:00

..

crates_lockers

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

2015-08-24 10:23:12 +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

…

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 pull request #10759 from mwerezak/girders

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

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

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 pull request #10442 from Baystation12/dev-freeze

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

musician.dm

…

noticeboard.dm

…

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/master' into dev-freeze

2015-08-25 08:12:39 +02:00

windoor_assembly.dm

…

window.dm

On merge changes and map conflict fixes.

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