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

# Conflicts:
#	code/game/objects/items/weapons/storage/bags.dm
#	code/game/objects/items/weapons/storage/uplink_kits.dm
#	code/game/objects/items/weapons/storage/wallets.dm

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

..

effects

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

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

items

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

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

random

Mass replace

2016-07-07 19:34:02 -07:00

structures

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

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

buckling.dm

fixes a ton of thing

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

empulse.dm

Fix remaining issues and sound shit

2016-04-05 16:26:11 -07:00

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

…