Markolie f5e2d82953 (Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise ...

Conflicts:
	code/game/machinery/atmoalter/canister.dm

2015-02-17 02:12:22 +01:00

..

crafting

Handcuff refactor, IV drip fix

2015-02-14 04:35:32 +01:00

helper_datums

Z-level check refactor

2015-02-16 20:33:28 +01:00

spells

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

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

wires

Vending machine overhaul, teleporter area fix, add events to status tab

2015-02-13 15:27:42 +01:00

ai_laws.dm

Remove zeroth law with own board

2015-02-10 03:06:43 +01:00

browser.dm

IT WOOOOOOOOORKS

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

cargoprofile.dm

Handcuff refactor, IV drip fix

2015-02-14 04:35:32 +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

Merge with upstream/maser

2015-02-09 18:22:19 -05:00

mixed.dm

…

modules.dm

…

organs.dm

…

periodic_news.dm

Announcement system overhaul, crew monitor system overhaul, add portable crew monitor

2015-02-16 19:03:29 +01:00

recipe.dm

…

spell.dm

Z-level check refactor

2015-02-16 20:33:28 +01:00

sun.dm

Solar update, convert solar to NanoUI

2015-02-16 21:35:34 +01:00

supplypacks.dm

Fix

2015-02-14 22:04:19 -05:00

uplink_item.dm

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

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