Minor Change, committing before the undertaking
Merge pull request #9 from ZomgPonies/master

Update
Trying to fix sniper rifle back sprite
Merge pull request #191 from Regen1/master

Fixed L.W.A.P charge cost
Fixes people getting karma jobs
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
Compile fix
Merge pull request #10 from ZomgPonies/master

Update
adds new feature: cloning extinct animals and seeds from fossils found through xenoarchaeology, some minor tweaks to various other areas to make it work

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

Conflicts:
	icons/obj/hydroponics.dmi
	icons/obj/xenoarchaeology.dmi
zas: fix zburn /0 runtime

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
IPC will no longer take damage from walking in glass. Not sure why this was happening beforehand.

Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
Fix for previous commit.

Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
Attempting to stop IPC from eating and drinking.
Lousy goddamn indentation.
Adding some repair procs to cables and welders for IPC use.

Conflicts:
	code/modules/power/cable.dm
Fixes for previous commit, sigh.
Removed 'You are now sterile' line from groin loss due to spam issues when lost by an IPC as well as general pointlessness.
Several IPC adjustments.

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
Map changes, new Ninja masks

Map changes including: RnD layout change, new customs lounge, xenoarch
windows fix, and more. Also added a few new Ninja masks in prep for some
bigger changes I have planned.
Merge pull request #192 from SamCroswell/master

Map changes, new ninja masks, more commits possibly to come