Mervill 3f68bd7202 Merge branch 'master' into a_intent ...

Conflicts:
	code/modules/mob/mob_defines.dm

2016-12-04 00:38:37 -08:00

..

devices

Merge branch 'master' into a_intent

2016-12-04 00:38:37 -08:00

robot

[READY]Lollipops, gumballs, and a cyborg module that shoots them out! (#21782)

2016-12-02 15:42:51 +13:00

stacks

Merge branch 'master' into w_class

2016-12-02 21:44:24 -08:00

weapons

Merge branch 'master' into a_intent

2016-12-04 00:38:37 -08:00

apc_frame.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00

blueprints.dm

Fixes hardsuit not having 300hp (I gave it to the helmet, but had forgotten about the suit itself)

2016-10-17 22:51:57 +02:00

body_egg.dm

Fixes all remaining addtimers missed

2016-11-27 08:31:07 +00:00

bodybag.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00

candle.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00

cardboard_cutouts.dm

a_intent now uses defines

2016-12-02 22:27:30 -08:00

charter.dm

Adds a Reply link to station charter

2016-10-26 01:01:57 -04:00

control_wand.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00

crayons.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00

dehy_carp.dm

Space carp ensure they still exist after animation sleep (#20710)

2016-09-28 11:01:43 -05:00

documents.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00

latexballoon.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00

nuke_tools.dm

Fixes hardsuit not having 300hp (I gave it to the helmet, but had forgotten about the suit itself)

2016-10-17 22:51:57 +02:00

religion.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00

shooting_range.dm

Added priority overlay system. (#18225)

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

toys.dm

m_intent now uses defines

2016-12-03 00:25:44 -08:00

trash.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00