Leshana e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink ...

# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme

2016-05-29 16:22:07 -04:00

..

food

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall

2016-05-28 20:22:09 +01:00

glass

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync

2016-05-18 10:13:26 -04:00

blood_pack.dm

Gives reagents/reagent_containers the absolute pathing treatment

2016-05-16 21:07:20 +01:00

borghydro.dm

Merge pull request #1592 from Anewbe/borg_changes

2016-05-28 12:44:27 -04:00

dropper.dm

Gives reagents/reagent_containers the absolute pathing treatment

2016-05-16 21:07:20 +01:00

food.dm

Fixes condiment placement

2016-02-26 12:24:36 +01:00

glass.dm

Xenobio2 Tweaks

2016-05-28 20:06:51 -04:00

hypospray.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall

2016-05-28 20:22:09 +01:00

pill.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall

2016-05-28 20:22:09 +01:00

spray.dm

Porting forensics from Aurora.

2015-12-10 19:16:28 +10:30

syringes.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall

2016-05-28 20:22:09 +01:00