Kelenius 6d54e1c655 Merge branch 'dev' into ofClicksAndCooldowns ...

Conflicts:
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/mob_grab.dm

2015-05-21 17:00:50 +03:00

..

crates_lockers

Merge branch 'dev' into ofClicksAndCooldowns

2015-05-21 17:00:50 +03:00

stool_bed_chair_nest

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

2015-05-12 14:39:21 +02:00

barsign.dm

Adds 9 new bar signs.

2015-04-24 17:35:07 +03:00

bedsheet_bin.dm

Removes most instances of item_color

2015-04-22 17:40:27 -04:00

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

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

door_assembly.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

electricchair.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

extinguisher.dm

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

2015-03-31 02:13:22 -04:00

flora.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

girders.dm

qdel

2015-05-12 13:12:58 +09:30

grille.dm

Removes click cooldowns almost everywhere.

2015-05-09 17:27:19 +03:00

inflatable.dm

Inflatables now lose deflate verb when it's used

2015-05-16 11:43:30 +03:00

janicart.dm

Chemistry commit

2015-03-25 19:09:10 +03:00

kitchen_spike.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

ladders.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

lamarr_cage.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

lattice.dm

Adds two missing pooling instances and corrects broken grilles health status.

2015-05-02 21:46:30 +02:00

mineral_doors.dm

qdel

2015-05-12 13:12:58 +09:30

mirror.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

mop_bucket.dm

Chemistry commit

2015-03-25 19:09:10 +03:00

morgue.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

musician.dm

…

noticeboard.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

safe.dm

Accessories update.

2015-02-08 12:35:50 +03:00

signs.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

tank_dispenser.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

target_stake.dm

Removes unnecessary and cruft procs from mob/inventory.dm

2015-03-30 05:28:09 -04:00

transit_tubes.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

under_wardrobe.dm

Attempts to fix persistent station alarms. Makes wardrobes solid.

2015-03-09 20:55:05 +01:00

watercloset.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

windoor_assembly.dm

Grilles and rods.

2015-05-02 21:35:02 +02:00

window.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-05-21 17:00:50 +03:00