Arokha Sieyes 17a64bebea Merge branch 'master' of https://github.com/PolarisSS13/Polaris into breakfix ...

# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/new_player/new_player.dm
#	vorestation.dme

2016-05-12 13:02:51 -04:00

..

food

Gives drinking glasses a material so they have a cost in autolathe

2016-05-08 15:51:16 +01:00

glass

Issue #4 - Porting resize (micro/macro) systems.

2016-05-08 23:11:03 -04:00

blood_pack.dm

Cargo can now order empty blood packs.

2014-11-30 16:45:52 +01:00

borghydro.dm

Adjusts the death-whiskey

2015-12-13 22:46:42 +00:00

dropper.dm

Properly log dropper-related assault for admins

2016-03-22 13:11:48 -04:00

food.dm

Fixes condiment placement

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

glass.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

hypospray.dm

Revert 58ef59734f

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

pill.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

spray.dm

Porting forensics from Aurora.

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

syringes.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00