PsiOmega 9e4dacc765 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/game/machinery/machinery.dm
	code/game/objects/items/weapons/storage/misc.dm
	code/game/response_team.dm
	html/changelogs/HarpyEagle-NeckgrabFix.yml

2015-05-07 08:14:57 +02:00

..

effects

Merge remote-tracking branch 'upstream/master' into dev

2015-05-05 08:11:28 +02:00

items

Merge remote-tracking branch 'upstream/master' into dev

2015-05-07 08:14:57 +02:00

random

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

structures

Merge pull request #9072 from PsiOmegaDelta/BrokenGrills

2015-05-04 21:25:24 +03:00

buckling.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

empulse.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

explosion_recursive.dm

Recursive explosion resistance values for walls, space tiles, grilles and airlocks tweaked

2015-05-03 21:53:02 +10:00

explosion.dm

Wireless Wires Bug Removal

2015-01-01 17:20:21 +01:00

items.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04:00

objs.dm

initialize() should now always be called, be it on game starting up or object being created after game start.

2015-04-30 19:28:35 +02:00

structures.dm

Merge remote-tracking branch 'upstream/dev' into TheSummoning

2015-04-24 17:13:37 +02:00

weapons.dm

…