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

Conflicts:
	code/__DEFINES/genetics.dm
	code/modules/mob/living/carbon/human/species_types.dm

2016-06-04 17:41:43 +02:00

..

beds_chairs

Merge pull request #17936 from MMMiracles/ruin_stuff

2016-05-31 15:58:12 +12:00

crates_lockers

repaths plant analyzers

2016-06-01 22:44:03 -07:00

transit_tubes

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

ai_core.dm

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-30 18:33:55 +03:00

aliens.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +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

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

displaycase.dm

the fact this never came up is surprising

2016-05-01 12:20:06 -04: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

…

extinguisher.dm

Wall-mounted extinguisher cabinets are now constructable/deconstructable

2016-04-29 15:31:23 +03:00

false_walls.dm

fix!

2016-06-01 20:17:48 -04:00

fireaxe.dm

Blobs can no longer eat the supermatter (#17205)

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

flora.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

girders.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

grille.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +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

- I made human/handle_blood() less shitty.

2016-06-04 17:33:16 +02:00

ladders.dm

Shuttle manipulator (#17436)

2016-05-26 15:15:19 +02:00

lattice.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

mineral_doors.dm

Same things but with structures now.

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

mirror.dm

Speed in nograv works correctly now

2016-05-08 16:39:54 -07:00

mop_bucket.dm

First commit of this big PR

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

morgue.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +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

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

reflector.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

safe.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

showcase.dm

Alternate escape shuttles and ferries (#16761)

2016-05-07 23:35:57 +02:00

signs.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +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

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

tables_racks.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

tank_dispenser.dm

First commit of this big PR

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

target_stake.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

watercloset.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

windoor_assembly.dm

First commit of this big PR

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

window.dm

More stuff, no conflict fix yet

2016-06-03 15:07:49 -04:00