Leshana 7a4dc4bf79 Merge remote-tracking branch 'polaris/master' into polaris-sync ...

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/zresearchlabs.dmm

2017-04-15 23:14:32 -05:00

..

drinkingglass

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

food

Merge remote-tracking branch 'polaris/master' into polaris-sync

2017-04-15 23:14:32 -05:00

glass

…

blood_pack.dm

Added in-hand sprites to most item lacking them from the Medical department.

2017-03-26 07:04:01 +01:00

borghydro.dm

…

dropper.dm

More tweaks

2017-02-28 01:13:29 -05:00

food.dm

…

glass_vr.dm

Dragor fluff items, Aronai fluff item fixes

2017-03-04 16:04:43 -05:00

glass.dm

Arokha SA Rework (Polaris)

2017-03-22 19:32:19 -04:00

hypospray_vr.dm

adds particle guns to science and cargo

2017-03-09 18:10:26 +00:00

hypospray.dm

Medical tweaks

2017-01-23 23:43:44 -06:00

pill.dm

Update pill.dm

2017-03-04 14:00:43 -05:00

spray_vr.dm

Adds Krak-B-Gone, a silicate spray for fixing windows

2017-02-14 18:29:55 +00:00

spray.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

syringes.dm

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

2017-03-11 18:47:17 -05:00