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

Conflicts:
	code/modules/mob/mob_defines.dm

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

..

_defines.dm

Neck Slots (#21169)

2016-10-26 19:03:41 +13:00

action_button.dm

Makes action buttons use the hud themes.

2016-11-19 14:05:06 +01:00

ai.dm

Cyborg and AI default theme.

2016-11-22 21:56:35 +01:00

alert.dm

Replaces the 'no cache' alert with an alert showing what you need for the next tier (#21689)

2016-11-25 13:25:56 +13:00

alien_larva.dm

Made the wheel system generic, so future coders can make different wheel types.

2016-09-16 14:45:05 +02:00

alien.dm

Makes action buttons use the hud themes.

2016-11-19 14:05:06 +01:00

blob_overmind.dm

Plane master handling + new chemical Rotatium (#20707)

2016-10-18 11:41:23 +02:00

blobbernauthud.dm

Blobbernauts now die slowly when not near the blob.

2016-02-29 16:41:59 -05:00

clockwork_marauder.dm

Clockwork Marauders now have a HUD (#21124)

2016-10-24 22:58:26 +13:00

devil.dm

Plane master handling + new chemical Rotatium (#20707)

2016-10-18 11:41:23 +02:00

drones.dm

Adds dextrous guardian (#19254)

2016-07-13 11:25:00 +12:00

fullscreen.dm

Revert "Human nightvision"

2016-11-25 15:21:33 +13:00

generic_dextrous.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

ghost.dm

Fixes the auto follow debris button

2016-11-29 11:48:16 -05:00

guardian.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

hud.dm

Revert "Human nightvision"

2016-11-25 15:21:33 +13:00

human.dm

m_intent now uses defines

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

monkey.dm

m_intent now uses defines

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

movable_screen_objects.dm

Action buttons will now only update when needed instead of every Life().

2016-02-22 00:34:59 +01:00

other_mobs.dm

Revert "Human nightvision"

2016-11-25 15:21:33 +13:00

plane_master.dm

Revert "Human nightvision"

2016-11-25 15:21:33 +13:00

revenanthud.dm

Replaces umbras with revenants (#19059)

2016-07-03 01:33:52 +12:00

robot.dm

Merge pull request #21639 from AnturK/fancybuttons

2016-11-22 16:25:42 -05:00

screen_objects.dm

Merge branch 'master' into a_intent

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

swarmer.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00