Kelenius ec1b6f122c Merge remote-tracking branch 'origin/dev' into ofJarsAndLizards ...

Conflicts:
	icons/obj/items.dmi
	maps/exodus-1.dmm

2015-04-16 19:17:10 +03:00

..

effects

Ports /vg/'s Nas-Sie remake.

2015-04-12 16:19:16 +02:00

items

Merge remote-tracking branch 'origin/dev' into ofJarsAndLizards

2015-04-16 19:17:10 +03:00

random

Tweaks random gun spawners and supply packs

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

structures

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

2015-04-14 15:54:22 +02: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

Refactors NanoUI interaction (again)

2015-04-10 11:19:38 +02: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

…