Mloc-Argent 712e209ab6 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm

2014-09-10 22:14:37 +01:00

..

closets

Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

2014-08-31 02:12:04 -07:00

effects

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

2014-09-10 22:14:37 +01:00

items

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

2014-09-10 22:14:37 +01:00

random

Cables are now stacks

2014-08-25 18:54:35 +04:00

structures

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

2014-09-10 22:14:37 +01: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