Kelenius 0071ed3f24 Merge branch 'dev' into ofClicksAndCooldowns ...

Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/machinery/deployable.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/setup.dm

2015-06-07 14:05:54 +03:00

..

crates_lockers

Merge branch 'dev' into ofClicksAndCooldowns

2015-06-07 14:05:54 +03:00

stool_bed_chair_nest

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01: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

objects/effects, objects/structures

2015-05-30 14:37:40 +01: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

…

flora.dm

…

girders.dm

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

grille.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-06-07 14:05:54 +03:00

inflatable.dm

objects/effects, objects/structures

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

janicart.dm

…

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

objects/effects, objects/structures

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

lattice.dm

objects/effects, objects/structures

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

mirror.dm

Adds attack animation calls for attack_generic()

2015-05-20 00:19:39 -04:00

mop_bucket.dm

…

morgue.dm

objects/effects, objects/structures

2015-05-30 14:37:40 +01: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

…

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

objects/effects, objects/structures

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

windoor_assembly.dm

objects/effects, objects/structures

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

window.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-06-07 14:05:54 +03:00