Anewbe 1591fdcc81 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into radiation_tweaks ...

# Conflicts:
#	code/game/objects/items/devices/defib.dm

2017-11-26 17:53:00 -06:00

..

devices

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

2017-11-26 17:53:00 -06:00

robot

Adds language module.

2017-10-26 15:43:25 -04:00

stacks

Nanopaste functions once more as an advanced damage kit for FBPs, ignoring the damage-limit of welders and cables. Now has a use-time for borgs and normal repair.

2017-11-17 11:44:07 -08:00

weapons

Finishes UFO PoI

2017-11-26 15:10:25 -05:00

antag_spawners.dm

Syndicate Borgs II, Return of the Salt

2017-10-20 13:01:45 -04:00

apc_frame.dm

…

blueprints.dm

Reworks cryopod storage

2017-10-20 19:14:45 +01:00

bodybag.dm

Standardization & grammar.

2017-11-17 13:18:32 -05:00

contraband.dm

…

crayons.dm

…

glassjar.dm

…

gunbox.dm

Allows detectives to take an optional revolver + some other stuff (#4217)

2017-11-05 22:53:11 -06:00

latexballoon.dm

…

paintkit.dm

…

shooting_range.dm

…

toys.dm

Adds bracelets!

2017-11-17 18:27:35 +00:00

trash.dm

Adds in an Unathi-made jerky snack

2017-04-07 23:36:22 -05:00