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

..

effects

Adds More Spiders. Touches cuff-code tangentially.

2017-11-21 12:59:06 -08:00

items

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

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

random

Removes the mosin-nagant, moves the sprites

2017-11-22 01:14:14 -06:00

structures

Pleases Travis hopefully.

2017-11-26 15:26:17 -05:00

buckling.dm

…

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

…

items.dm

Enables the combo blend mode for most colorable loadout gear.

2017-11-02 15:33:52 +02:00

objs.dm

Reworks cryopod storage

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

structures.dm

…

weapons.dm

…