Anewbe 7e279ebd03 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into electric_welder ...

# Conflicts:
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi

2017-03-28 00:17:28 -05:00

..

effects

Makes space in the uniforms.dmi file

2017-03-26 00:59:14 -05:00

items

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

2017-03-28 00:17:28 -05:00

random

Merge pull request #3064 from Woodratt/WR_SC_Changes

2017-03-08 19:58:46 -06:00

structures

Merge pull request #3144 from Anewbe/uniforms

2017-03-26 18:14:06 -04:00

buckling.dm

Gives cyborgs the ability to unbuckle things.

2016-11-18 14:49:57 -06:00

empulse.dm

Reworks empulse and emp_act

2017-03-05 12:22:45 -06:00

explosion_recursive.dm

…

explosion.dm

…

items.dm

Fixed the attack messages from items being placed into bags

2017-01-16 17:11:42 -06:00

objs.dm

…

structures.dm

Centralizes weight class definitions

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

weapons.dm

…