HarpyEagle 7f066065d3 Merge remote-tracking branch 'upstream/dev' into attack-cleanup2 ...

Conflicts:
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

2015-10-05 19:20:33 -04:00

..

crates_lockers

Mob size tweaks.

2015-09-20 17:12:07 +02:00

stool_bed_chair_nest

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -04: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

Resprites, renames, and repaths the detective uniforms.

2015-08-22 19:43:28 -05:00

curtains.dm

Fewer decal icon states, shower curtains.

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

displaycase.dm

Structures now take damage properly from projectile clouds

2015-08-15 19:08:45 -04: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

…

flora.dm

…

girders.dm

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

grille.dm

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

inflatable.dm

Structures now take damage properly from projectile clouds

2015-08-15 19:08:45 -04:00

janicart.dm

…

kitchen_spike.dm

Mob size tweaks.

2015-09-20 17:12:07 +02:00

lamarr_cage.dm

…

lattice.dm

Multi-Z.

2015-08-30 14:15:20 -07:00

mirror.dm

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

mop_bucket.dm

…

morgue.dm

Merge branch 'dev' into ofSleepersAndNano

2015-08-13 09:20:51 +03:00

musician.dm

…

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

…

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 pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30