Markolie a6a7cf9d36 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into zefix ...

# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	code/game/jobs/job/job.dm

2017-03-10 12:42:37 +01:00

..

effects

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

2017-03-08 10:45:16 +01:00

items

Merge pull request #6711 from Crazylemon64/playercreation_assembly_line

2017-03-09 21:30:22 -05:00

random

…

structures

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

2017-03-10 12:42:37 +01:00

buckling.dm

fixes a ton of thing

2017-01-24 03:23:16 -05:00

empulse.dm

…

explosion.dm

Ports over the status effect unification

2016-10-23 15:45:35 -07:00

items.dm

Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold

2017-03-05 19:53:20 +01:00

objs.dm

Removes Unused Object

2017-01-20 21:50:00 -05:00

structures.dm

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

weapons.dm

…