SinTwo f50adb9554 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade ...

Conflicts:
	code/_helpers/time.dm
	code/modules/economy/ATM.dm

2016-08-09 15:46:24 -04:00

..

devices

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

2016-08-09 15:46:24 -04:00

robot

Robot upgrades now checks that the upgrade type is valid.

2016-07-23 16:13:29 +01:00

stacks

Grammar typo fix

2016-08-07 00:51:33 +01:00

weapons

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

2016-08-09 15:46:24 -04:00

apc_frame.dm

…

blueprints.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

bodybag.dm

Freezer Fixes

2016-07-10 03:00:25 -04: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

item_state cleanup

2016-07-11 22:31:32 -04:00

paintkit.dm

Added get_bodytype() species proc as groundwork for subspecies.

2015-08-22 02:53:16 +09:30

shooting_range.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-30 10:49:37 +02:00

toys.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

trash.dm

Adds a new vending machine that vends fitness related products

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