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

..

effects

Merge pull request #3118 from Neerti/3/6/2017_surface_map

2017-03-22 16:33:40 -05:00

items

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

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

random

Merge pull request #3064 from Woodratt/WR_SC_Changes

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

structures

Merge pull request #3118 from Neerti/3/6/2017_surface_map

2017-03-22 16:33:40 -05: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

Merge pull request #2015 from Neerti/12/16/2015_newwizard

2016-07-10 03:43:35 +01:00

structures.dm

Centralizes weight class definitions

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

weapons.dm

item_state cleanup

2016-07-11 22:31:32 -04:00