mwerezak ababfc1d0c Merge remote-tracking branch 'upstream/dev-freeze' into dev-fixes ...

Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm

2014-08-22 01:24:34 -04:00

..

closets

…

effects

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

items

Compile fixes.

2014-08-21 12:19:10 +09:30

random

…

structures

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

2014-08-22 01:24:34 -04:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

…

items.dm

fixes nullpointer caused by broken organ list pt 2

2014-07-26 13:08:25 +02: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

Hydroponics rewrite, details will be in PR. Big commit.

2014-07-25 22:16:04 +09:30

weapons.dm

Merge remote-tracking branch 'upstream/dev' into stun-baton

2014-07-31 14:31:21 -04:00