Anewbe 82f24079f4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits ...

# Conflicts:
#	code/game/jobs/job/assistant.dm
#	code/game/jobs/job/civilian.dm
#	code/modules/admin/admin_verbs.dm

2017-10-04 20:08:55 -05:00

..

devices

Merge pull request #3991 from MisterLayne/9/30/17_BetterTRAY

2017-10-01 10:58:35 -05:00

robot

Merge pull request #3769 from PrismaticGynoid/forgottenlanguages

2017-09-16 15:35:29 -05:00

stacks

Adds differing stack sprites

2017-09-28 01:04:19 -04:00

weapons

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

2017-10-04 20:08:55 -05:00

apc_frame.dm

…

blueprints.dm

Extend Station Blueprints to consider outdoor mining areas as "space"

2017-03-03 20:12:03 -05:00

bodybag.dm

Some more types which need Destroy to return qdel hints!

2017-06-14 01:13:54 -04:00

contraband.dm

…

crayons.dm

…

glassjar.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -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

Katana was defined twice

2017-09-30 17:35:11 -04:00

trash.dm

Adds in an Unathi-made jerky snack

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