GinjaNinja32 76654321e4 Merge remote-tracking branch 'upstream/dev' into new_tables ...

Conflicts:
	code/setup.dm

2015-05-16 08:53:33 +01:00

..

sheets

Generalises shards, makes tables possibly create shards when falling apart, make tablesmash potentially give someone a faceful of broken glass if the table breaks

2015-05-15 04:47:18 +01:00

tiles

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

matter_synth.dm

Adds the research module, condensed into one commit so far.

2015-04-04 20:17:59 -04:00

medical.dm

Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173.

2015-05-15 23:19:57 +09:30

nanopaste.dm

Replaced display_name with name, worked on severing limbs and damage propagation.

2015-03-25 19:07:22 +10:30

rods.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

stack.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00