Mloc-Hibernia 51d2451c01 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	nano/templates/geoscanner.tmpl

2014-07-18 13:15:30 +00:00

..

closets

…

effects

Stops buckled mobs from slipping (for now)

2014-07-02 22:36:49 +02:00

items

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

2014-07-18 13:15:30 +00:00

random

…

structures

Merge remote-tracking branch 'upstream/dev' into op-hideout

2014-07-16 17:41:30 -04:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

…

items.dm

Fixes human internal organs list

2014-07-12 16:15:37 -04:00

objs.dm

rework talking items and re-enable them, made xenoarch boxes have a variable internal size, added three new eldritch xenoarch finds (poltergeist mask, vampiric statuette, endless replenishing container)

2014-06-20 18:42:25 +10:00

structures.dm

Fucking Hell I'm an idiot.

2014-07-03 05:10:31 +09:30

weapons.dm

…