Markolie 354e569f9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise ...

Conflicts:
	code/game/machinery/rechargestation.dm

2015-02-09 16:15:00 +01:00

..

crafting

Defib update, cell path update

2015-02-09 16:12:01 +01:00

helper_datums

Fixes teleporting while buckled

2014-07-13 06:47:28 -04:00

spells

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

2015-02-09 16:15:00 +01:00

visibility_networks

Makes it possible for the AI to alt+left click turfs in camera view and grants ctrl/alt shortcuts to the turret control.

2014-07-23 14:55:03 -04:00

wires

Autolathe hack fix

2014-12-24 19:15:13 +01:00

ai_laws.dm

Deathsquad Cyborgs

2014-11-27 01:38:52 -05:00

browser.dm

IT WOOOOOOOOORKS

2014-12-06 16:19:47 -05:00

cargoprofile.dm

Defib update, cell path update

2015-02-09 16:12:01 +01:00

computerfiles.dm

…

datacore.dm

Major map overhaul, remove customs officer/nanotrasen recruiter

2015-01-12 02:23:45 +01:00

datumvars.dm

Made update_power be at mob level since spells are at that level.

2014-07-18 12:11:13 -04:00

medical_effects.dm

Unused/WorkInProgress folder cleanup

2015-01-31 16:40:29 +01:00

mind.dm

Fixes artificer spell being removed

2015-02-08 23:54:52 +01:00

mixed.dm

…

modules.dm

…

organs.dm

…

periodic_news.dm

Unused/WorkInProgress folder cleanup

2015-01-31 16:40:29 +01:00

recipe.dm

…

spell.dm

Genetics fixes

2014-08-16 11:51:17 +01:00

sun.dm

BS12 Hooks

2014-05-22 23:56:35 +02:00

supplypacks.dm

Defib update, cell path update

2015-02-09 16:12:01 +01:00

uplink_item.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

2015-02-09 16:15:00 +01:00