Arokha Sieyes 76567bb7a2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync ...

# Conflicts:
#	code/modules/mob/living/carbon/human/whisper.dm

Whisper modified locally, and deleted upstream (in a change I made, so I know it's safe to remove).

2016-05-26 09:59:18 -04:00

..

food

Merge pull request #1710 from Yoshax/fitnessvendor

2016-05-21 12:11:29 -04: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

Adjusts the death-whiskey

2015-12-13 22:46:42 +00: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

Gives reagents/reagent_containers the absolute pathing treatment

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

hypospray.dm

Revert 58ef59734f

2015-11-08 10:09:14 -05:00

pill.dm

Adds a new vending machine that vends fitness related products

2016-05-20 22:04:00 +01:00

spray.dm

Porting forensics from Aurora.

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

syringes.dm

Adds a new vending machine that vends fitness related products

2016-05-20 22:04:00 +01:00