Anewbe d53cfc4773 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins ...

# Conflicts:
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
#	icons/mob/human_face.dmi
#	icons/mob/suit.dmi

2017-01-17 22:05:38 -06:00

..

devices

Merge pull request #2891 from Anewbe/cyber_scan

2017-01-14 14:39:18 -06: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 theUnboxingBegins

2017-01-17 22:05:38 -06:00

apc_frame.dm

…

blueprints.dm

…

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