LetterJay cd0997aa1e Merge branch 'master' into upstream-merge-30297

2017-09-12 23:36:35 -05:00

..

ark_of_the_clockwork_justicar.dm

ok this is going to be a pain in the ass ain't it (#2458)

2017-08-22 05:01:38 -07:00

clockwork_obelisk.dm

Replaces ex_act and emp_act numbers with defines

2017-07-13 17:46:41 -05:00

geis_binding.dm

[MIRROR] Some more tweaks to Geis (#2487)

2017-08-27 01:36:17 -07:00

interdiction_lens.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

mania_motor.dm

Removes now-unnecessary obj_integrity definitions

2017-07-09 19:44:48 -05:00

ocular_warden.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

prolonging_prism.dm

Merge branch 'master' into upstream-merge-30297

2017-09-12 23:36:35 -05:00

ratvar_the_clockwork_justicar.dm

Makes the Ark of the Clockwork Justicar much more fancy

2017-08-20 19:55:15 -05:00

taunting_trail.dm

Rename Bumped to CollidedWith (#2017)

2017-07-15 11:44:12 -07:00

tinkerers_cache.dm

Clockwork component icons for tgui will only be generated once (#1995)

2017-07-14 03:21:13 -07:00

tinkerers_daemon.dm

Clockwork component icons for tgui will only be generated once (#1995)

2017-07-14 03:21:13 -07:00

wall_gear.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00