KorPhaeron 2bb41cd5b3 Merge remote-tracking branch 'refs/remotes/tgstation/master' into control_wand ...

# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm

2016-03-01 19:18:29 -06:00

..

effects

Merge pull request #15698 from LanCartwright/flyvomit

2016-03-01 21:30:15 -03:00

items

Merge remote-tracking branch 'refs/remotes/tgstation/master' into control_wand

2016-03-01 19:18:29 -06:00

structures

Merge remote-tracking branch 'refs/remotes/tgstation/master' into control_wand

2016-03-01 19:18:29 -06:00

buckling.dm

…

empulse.dm

…

explosion.dm

…

items.dm

Refactored the item's action system. Items can now hold multiple actions.

2016-02-23 19:37:42 +01:00

objs.dm

Merge remote-tracking branch 'upstream/master' into patch-130

2016-02-07 17:41:42 -08:00

radiation.dm

…

structures.dm

Splits beds and chairs

2016-02-18 17:55:38 +01:00

weapons.dm

…