LetterJay 1471b6cac6 Merge branch 'master' into upstream-merge-30297

2017-09-13 06:41:37 -05:00

..

camera

[MIRROR] Adds defines for mouse_opacity (#2381)

2017-08-21 20:29:37 -07:00

dead

Merge branch 'master' into upstream-merge-30297

2017-09-13 06:41:37 -05:00

living

Merge branch 'master' into upstream-merge-30297

2017-09-13 06:41:37 -05:00

death.dm

…

inventory.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

here we go again (#2456)

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

mob_helpers.dm

Adds missing span-endings

2017-09-11 07:10:09 -05:00

mob_movement.dm

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

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

mob_transformation_simple.dm

…

mob.dm

Merge branch 'master' into upstream-merge-29839

2017-09-11 18:03:51 -05:00

say_readme.dm

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

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

say_vr.dm

…

say.dm

…

status_procs.dm

this sure was FUN

2017-09-07 09:47:56 -05:00

transform_procs.dm

Merge branch 'master' into upstream-merge-29923

2017-08-28 09:19:44 -05:00

update_icons.dm

…