Arokha Sieyes 9016ca94c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018 ...

# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.

2018-01-22 12:10:19 -05:00

..

drinkingglass

Adds Apple Juice.

2018-01-17 07:29:40 +00:00

food

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018

2018-01-22 12:10:19 -05:00

glass

Update VOREStation specific code to use merged in features.

2018-01-19 18:15:47 -05:00

blood_pack_vr.dm

Update blood_pack_vr.dm

2017-10-26 23:49:25 -04:00

blood_pack.dm

Dropper and bloodpack improvements (#4453)

2017-12-31 11:49:20 -08:00

borghydro.dm

Take two. New drinks (#4259)

2017-12-09 16:25:06 -06:00

dropper.dm

Dropper and bloodpack improvements (#4453)

2017-12-31 11:49:20 -08:00

food.dm

…

glass_vr.dm

Merge branch 'master' into hypo

2018-01-20 01:39:16 -05:00

glass.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19

2018-01-19 17:52:25 -05:00

hypospray_vr.dm

Removes hypospray/vr and vial/vr

2018-01-18 19:01:26 -05:00

hypospray.dm

Update hypospray.dm

2017-10-31 20:52:02 -05:00

pill.dm

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

2017-12-26 23:07:58 -05:00

spray_vr.dm

…

spray.dm

Works on New Blob

2017-11-29 22:35:01 -05:00

syringes.dm

Pol Sync

2017-10-08 17:44:25 -04:00