Anewbe 2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2 ...

# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm

2017-03-22 17:29:01 -05:00

..

devices

Communicator QoL

2017-03-21 00:51:26 -05:00

robot

Robot upgrades now checks that the upgrade type is valid.

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

stacks

Replaces [stack]/fifty atoms with atoms that spawn the normal stack

2016-12-17 17:27:04 -06:00

weapons

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

2017-03-22 17:29:01 -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

Returns the Vox, who now breath Phoron

2017-01-06 17:49:39 -06:00

contraband.dm

…

crayons.dm

…

glassjar.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

latexballoon.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

paintkit.dm

…

shooting_range.dm

…

toys.dm

Replaces Station Administrator

2016-10-06 22:38:02 -04:00

trash.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00