Arokha Sieyes 17a64bebea Merge branch 'master' of https://github.com/PolarisSS13/Polaris into breakfix ...

# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/new_player/new_player.dm
#	vorestation.dme

2016-05-12 13:02:51 -04:00

..

devices

Merge pull request #1602 from redstryker/master

2016-05-11 02:00:51 -04:00

robot

Adds doghounds. WIP

2016-05-08 12:19:03 -04:00

stacks

Merge pull request #1479 from Yoshax/limbfixes

2016-05-11 01:53:58 -04:00

weapons

Merge pull request #1560 from Yoshax/emagupgrade

2016-05-11 01:55:12 -04:00

apc_frame.dm

…

blueprints.dm

…

bodybag.dm

Morgue Trays interface with occupant minds

2016-04-25 20:10:43 +02:00

contraband.dm

…

crayons.dm

…

glassjar.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

latexballoon.dm

…

paintkit.dm

…

shooting_range.dm

…

toys.dm

Fixes issues travis found

2016-03-11 11:59:51 +03:00

trash.dm

…