Markolie 50a176571a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise ...

Conflicts:
	maps/cyberiad.dmm

2014-12-18 17:13:18 +01:00

..

closets

…

effects

Xeno Tweaking

2014-12-16 20:26:27 -05:00

items

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

2014-12-18 17:13:18 +01:00

random

…

storage

…

structures

Bug fixes

2014-12-17 21:56:37 +01:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

Explosions go to attack logs.

2014-06-21 07:27:31 -04:00

items.dm

Variable typo fix, add proper Unati/Tajaran hardsuit conversion from Baystation

2014-11-22 02:24:21 +01: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 08:47:51 -04:00

structures.dm

Merge pull request #508 from Markolie/master

2014-11-22 00:57:02 -05:00

weapons.dm

…