Zuhayr d606d774d8 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. ...

Conflicts:
	baystation12.dme
	code/controllers/configuration.dm
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/examine.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/recycling/disposal.dm
	icons/mob/robots.dmi
	icons/obj/device.dmi

2014-05-12 01:41:02 -04:00

..

__HELPERS

Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.

2014-05-12 01:41:02 -04:00

_hooks

Missing file

2014-03-11 02:49:08 -04:00

_onclick

Object pool for beam projectile, minor changes to object pool.

2014-04-29 13:33:06 -04:00

ATMOSPHERICS

Atmos mainline pipe code moved and enabled.

2014-04-30 13:51:29 -04:00

controllers

Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.

2014-05-12 01:41:02 -04:00

datums

Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.

2014-05-12 01:41:02 -04:00

defines

Male VOX.

2014-04-28 20:38:28 -04:00

FEA

…

game

Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.

2014-05-12 01:41:02 -04:00

js

…

modules

Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.

2014-05-12 01:41:02 -04:00

TriDimension

…

unused

Virology - NanoUI, gameplay tweaks, bugfixes

2014-04-19 15:42:49 -04:00

WorkInProgress

Feed and Facehug no longer use a menu and instead pick a random target in range.

2014-05-07 21:43:17 -04:00

ZAS

zas: fix zburn /0 runtime

2014-05-03 17:29:55 -04:00

ZAS - oldbs12

ZAS overhaul

2014-02-22 23:10:37 -05:00

ZAS - vg

…

global.dm

Map changes, new Ninja masks

2014-05-03 18:35:10 -04:00

hub.dm

…

names.dm

…

setup.dm

Adds Mentors.

2014-05-04 21:37:37 -04:00

stylesheet.dm

Add colour to AI private channel (144.7)

2014-04-19 15:44:48 -04:00

world.dm

Makes this shit actually work

2014-05-04 22:55:42 -04:00