Jack Edge a09544992c Merge branch 'master' into shuttle-processing ...

Conflicts:
	code/modules/shuttle/ripple.dm

2016-06-26 01:00:25 +01:00

..

devices

fixes medical holosign

2016-06-23 22:51:16 -04:00

robot

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

stacks

Merge pull request #18820 from Xhuis/the_pinnacle_of_deception_technology

2016-06-24 20:14:59 +12:00

weapons

Code review I

2016-06-25 20:26:59 +01:00

apc_frame.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

blueprints.dm

Cyborg Blueprints

2016-04-30 03:47:51 -05:00

body_egg.dm

Merge pull request #18729 from coiax/remove-spawn-3

2016-06-21 20:11:08 +12:00

bodybag.dm

Code cleanup; silicons, melee, hallucinations

2016-06-24 14:03:44 +01:00

candle.dm

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

cardboard_cutouts.dm

Makes cutouts vulnerable to bullets

2016-06-23 18:18:40 -04:00

charter.dm

Applied MSO's proposed changes

2016-06-21 13:34:36 +01:00

control_wand.dm

properly

2016-06-13 09:43:01 -04:00

crayons.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

dehy_carp.dm

Using a dehydrated carp no longer strips the neutral faction from the owner.

2016-06-14 22:01:00 -04:00

documents.dm

Layers are now defines (#17949)

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

latexballoon.dm

Code cleanup; silicons, melee, hallucinations

2016-06-24 14:03:44 +01:00

nuke_tools.dm

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

shooting_range.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

toys.dm

Merge branch 'master' into shuttle-processing

2016-06-26 01:00:25 +01:00

trash.dm

Code cleanup; silicons, melee, hallucinations

2016-06-24 14:03:44 +01:00