Markolie d40cfe582e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into swordnborg ...

Conflicts:
	icons/obj/surgery.dmi

2015-10-01 04:32:10 +02:00

..

effects

Nuke wheelchair snowflake shit, fix the delay

2015-09-28 12:59:44 -07:00

items

Alien claws fix

2015-10-01 04:27:59 +02:00

random

…

structures

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

2015-10-01 04:32:10 +02:00

buckling.dm

-tg- buckling system

2015-09-24 15:52:10 -07:00

empulse.dm

…

explosion.dm

New proc to replace world.log <<, log_to_dd()

2015-08-14 18:18:57 -07:00

items.dm

Saber SMG update, add armour piercing variable

2015-09-21 22:50:07 +02:00

objs.dm

Materialized Datums

2015-09-04 01:40:06 -04:00

structures.dm

-tg- buckling system

2015-09-24 15:52:10 -07:00

weapons.dm

…