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

..

carbon

Z-level check refactor

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

silicon

Bug fixes, give roboticist toolbelt, AI recall shuttle option

2015-02-17 01:04:04 +01:00

simple_animal

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

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

damage_procs.dm

Kills Armor RNG

2015-01-17 20:22:12 -05:00

living_defense.dm

Armor/Damage Changes

2015-01-17 22:33:47 -05:00

living_defines.dm

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

2014-12-13 02:15:05 +01:00

living.dm

Handcuff refactor, IV drip fix

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

login.dm

…

logout.dm

…

say.dm

Fixes binary key translating hive channel

2015-01-28 09:37:12 -05:00