PsiOmega 71a8ddf50e Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/paperwork/paper.dm
	code/modules/projectiles/projectile.dm

2015-04-08 10:55:26 +02:00

..

effects

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs

2015-03-26 23:25:26 +10:30

items

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

2015-04-08 10:55:26 +02:00

random

Tweaks random gun spawners and supply packs

2015-03-09 15:47:25 -04:00

structures

Changes flour sacks to a condiment, so that players will be able to pour flour straight into beakers, instead of having to use the grinder first.

2015-04-06 18:40:11 -04:00

buckling.dm

Fixed buckling into chair not changing mob's facing if he had permafacing set.

2015-02-26 12:09:23 +03:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

…

items.dm

Merge pull request #8604 from Zuhayr/limbs

2015-03-31 08:38:54 +03:00

objs.dm

Partial breathing refactor

2015-03-09 00:09:34 -04:00

structures.dm

Replaced display_name with name, worked on severing limbs and damage propagation.

2015-03-25 19:07:22 +10:30

weapons.dm

…