Anewbe ef1749009a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into implanter_fix ...

# Conflicts:
#	icons/obj/items.dmi

2017-09-28 15:56:53 -05:00

..

devices

Merge pull request #3948 from Anewbe/flash_shield

2017-09-27 19:05:58 -04:00

robot

Merge pull request #3769 from PrismaticGynoid/forgottenlanguages

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

stacks

Improves catwalks and railings

2017-09-23 20:43:51 -05:00

weapons

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

2017-09-28 15:56:53 -05:00

apc_frame.dm

…

blueprints.dm

…

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

…

latexballoon.dm

…

paintkit.dm

…

shooting_range.dm

…

toys.dm

Adds a short delay between plushie messages.

2017-09-10 14:16:07 -04:00

trash.dm

Adds in an Unathi-made jerky snack

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