phil235 7900f80544 Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAlienStructureProjDodge ...

Conflicts:
	code/game/objects/structures/aliens.dm

2016-04-29 20:58:02 +02:00

..

beds_chairs

Fixes runtime when thermiting a wall

2016-04-28 20:44:02 +02:00

crates_lockers

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

transit_tubes

Same things but with structures now.

2016-04-24 20:38:33 +02:00

ai_core.dm

Same things but with structures now.

2016-04-24 20:38:33 +02:00

aliens.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAlienStructureProjDodge

2016-04-29 20:58:02 +02:00

artstuff.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

barsigns.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

bedsheet_bin.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction

2016-04-26 21:49:51 +02:00

displaycase.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

door_assembly.dm

Doors can now be attacked when clicked on harm intent. (they're currently indestructible so it's only cosmetic for now). I tried to make door code more OOP.

2016-04-24 20:39:30 +02:00

dresser.dm

…

electricchair.dm

Atoms may now have many mobs buckled to them, as opposed to one, this is controlled by the new max_buckled_mobs var on atoms, defaults to 1 as to not change any current functionality

2016-03-07 18:03:25 +00:00

extinguisher.dm

istype(user)

2016-04-17 15:15:52 -07:00

false_walls.dm

Fixes falsewalls being unsmashable (#17135)

2016-04-27 17:29:56 +02:00

fireaxe.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

flora.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

girders.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

grille.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

guncase.dm

Same things but with structures now.

2016-04-24 20:38:33 +02:00

hivebot.dm

…

janicart.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

kitchen_spike.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

ladders.dm

…

lattice.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

mineral_doors.dm

Same things but with structures now.

2016-04-24 20:38:33 +02:00

mirror.dm

Same things but with structures now.

2016-04-24 20:38:33 +02:00

mop_bucket.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

morgue.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

musician.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

noticeboard.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

plasticflaps.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

reflector.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

safe.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

showcase.dm

…

signs.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

spirit_board.dm

…

statues.dm

Removing some comments I had left in.

2016-04-24 21:12:04 +02:00

table_frames.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

tables_racks.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

tank_dispenser.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

target_stake.dm

…

watercloset.dm

Merge pull request #17124 from MrPerson/wrapped_up_nicely_with_a_bow

2016-04-29 16:03:59 +03:00

windoor_assembly.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

window.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00