LetterJay 35df3ca80e Merge pull request #1683 from Citadel-Station-13/upstream-merge-28583 ...

[MIRROR] Adds framework for equip delays and adds it to the straight jacket

2017-06-20 01:30:32 -05:00

..

effects

Merge branch 'master' into upstream-merge-26965

2017-06-19 15:39:01 -05:00

items

Merge pull request #1490 from Citadel-Station-13/upstream-merge-26965

2017-06-19 17:25:18 -05:00

structures

Dufflebag => Dufflebag

2017-06-19 16:42:05 -05:00

buckling.dm

Fixes gang turrets buckle code (atleast most of it)

2017-06-13 02:34:27 -05:00

empulse.dm

Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual

2017-05-18 16:38:09 -05:00

items.dm

Merge pull request #1683 from Citadel-Station-13/upstream-merge-28583

2017-06-20 01:30:32 -05:00

obj_defense.dm

upstream-merge-27971

2017-06-11 08:21:14 -05:00

objs.dm

upstream-merge-28109

2017-06-13 01:10:21 -05:00

radiation.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

structures.dm

/tg/ 4/14 (#367)

2017-04-14 23:28:04 -05:00

weapons.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00