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

..

devices

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

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

robot

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

2017-04-01 19:19:42 -04:00

stacks

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

2017-04-02 23:25:59 -04:00

weapons

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

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

apc_frame.dm

…

blueprints.dm

Made blueprints able to expand station areas into spae

2017-03-04 23:14:12 -05:00

bodybag.dm

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

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

contraband_vr.dm

50 sheet stacks fix

2016-12-27 08:42:59 -05:00

contraband.dm

…

crayons.dm

…

glassjar.dm

Polaris Sync October 9th (#633)

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

latexballoon.dm

Ports a bunch of fluff stuff

2017-02-21 13:50:14 -06:00

paintkit.dm

…

shooting_range.dm

…

toys.dm

Polaris Sync October 9th (#633)

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

trash.dm

Adds in an Unathi-made jerky snack

2017-04-07 23:36:22 -05:00