Whitellama 71c2317264 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame ...

Conflicts:
	code/game/objects/items/weapons/storage/belt.dm

2014-09-01 18:31:26 -07: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

Made portals clickable

2014-08-28 22:04:20 +04:00

items

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame

2014-09-01 18:31:26 -07:00

random

Fixes #4721

2014-04-12 13:06:10 +03:00

structures

Fixes tank dispenser sprite not updating icons when a tank is added

2014-08-31 15:22:13 -07: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

Fucking Hell I'm an idiot.

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

weapons.dm

…