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

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	icons/atmos/pipes.dmi

2014-10-15 14:40:42 +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 branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

items

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

2014-10-15 14:40:42 +01:00

random

Cables are now stacks

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

structures

Fixes #6644

2014-10-11 07:44:48 +10:30

empulse.dm

…

explosion_recursive.dm

Explosion Optimizations

2014-01-08 19:21:47 +00:00

explosion.dm

3d Sound from /tg/

2014-03-27 14:49:49 -04:00

items.dm

Fixes #6613 and #6492

2014-10-08 23:10:12 +10:30

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

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

weapons.dm

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

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