Arokha Sieyes 484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris ...

# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm

2016-07-03 16:21:21 -04:00

..

devices

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

2016-07-03 16:21:21 -04:00

robot

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

2016-05-31 18:17:58 -04:00

stacks

Clicking a stack no longer transfers one sheet at a time.

2016-06-27 11:30:55 -05:00

weapons

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

2016-07-03 16:21:21 -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

Adds a new vending machine that vends fitness related products

2016-05-20 22:04:00 +01:00