Markolie 8bede1db99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace ...

Conflicts:
	code/modules/mob/living/simple_animal/friendly/fox.dm
	code/modules/organs/organ_alien.dm

2015-08-18 18:38:59 +02:00

..

robot_items.dm

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

robot_parts.dm

IPC overhaul part deux

2015-08-16 02:34:52 +02:00

robot_upgrades.dm

Add borg headlamp, add movement states for surgeon/miner bot, add jetpack overlay to all miner borgs

2015-07-30 19:33:49 +02:00